--- parser3/src/classes/table.C	2003/04/02 08:49:57	1.172.2.14.2.21
+++ parser3/src/classes/table.C	2003/04/11 11:47:05	1.175
@@ -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/04/02 08:49:57 $";
+static const char* IDENT_TABLE_C="$Date: 2003/04/11 11:47:05 $";
 
 #include "classes.h"
-#include "pa_vmethod_frame.h"
-
 #include "pa_common.h"
 #include "pa_request.h"
 #include "pa_vtable.h"
@@ -19,55 +17,36 @@ static const char* IDENT_TABLE_C="$Date:
 
 // class
 
-class MTable: public Methoded {
+class MTable : public Methoded {
 public: // VStateless_class
-	Value* create_new_value() { return 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
-
-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"
-
-// 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);
-
 // methods
 
-static void get_copy_options(Request& r, MethodParams* params, size_t param_index,
+static void get_copy_options(Request& r, const String& method_name, MethodParams *params, int param_index,
 							 const Table& source,
 							 int& offset,
 							 int& limit) {
-
 	offset=0;
 	limit=0;
-	if(params->count()<=param_index)
+	if(params->size()<=param_index)
 		return;
 
 	Value& voptions=params->as_no_junction(param_index, "options must be hash, not code");
 	if(!voptions.is_string()) {
-		if(HashStringValue* options=voptions.get_hash()) {
+		if(Hash *options=voptions.get_hash(&method_name)) {
 			int valid_options=0;
-			if(Value* voffset=options->get(sql_offset_name)) {
+			if(Value *voffset=(Value *)options->get(*sql_offset_name)) {
 				valid_options++;
 				if(voffset->is_string()) {
-					const String&  soffset=*voffset->get_string();
+					const String& soffset=*voffset->get_string();
 					if(soffset == "cur")
 						offset=source.current();
 					else
@@ -77,104 +56,109 @@ static void get_copy_options(Request& r,
 				} else 
 					offset=r.process_to_value(*voffset).as_int();
 			}
-			if(Value* vlimit=options->get(sql_limit_name)) {
+			if(Value *vlimit=(Value *)options->get(*sql_limit_name)) {
 				valid_options++;
 				limit=r.process_to_value(*vlimit).as_int();
-				if(!limit) // zero limit = should be 'nothing to copy', for methods zero means 'all'
-					limit=-1; // thus fixing
 			}
-			if(valid_options!=options->count())
+			if(valid_options!=options->size())
 				throw Exception("parser.runtime",
-					0,
+					&method_name,
 					"called with invalid option");
 		} else
 			throw Exception("parser.runtime",
-				0,
+				&method_name,
 				"options must be hash");
 	}
+	if(!limit) // zero limit = sould be 'nothing to copy', for methods zero means 'all'
+		limit=-1; // thus fixing
 }
 
-static void _create(Request& r, MethodParams* params) {
+static void _create(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
 	// clone/copy part?
-	if(Table *source=(*params)[0]->get_table()) {
+	if(const Table *source=params->get(0).get_table()) {
 		int offset, limit;
-		get_copy_options(r, params, 1, *source, 
+		get_copy_options(r, method_name, params, 1, *source, 
 			offset, limit);
-		GET_SELF(r, VTable).set_table(*new Table(*source, offset, limit));
+		static_cast<VTable *>(r.get_self())->set_table(*new(pool) Table(pool, *source, offset, limit));
 		return;
 	}
 
 	// 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"));
+	Temp_lang temp_lang(r, String::UL_PASS_APPENDED);
+	const String& data=
+		r.process_to_string(params->as_junction(params->size()-1, "body must be code"));
 
+	size_t pos_after=0;
 	// parse columns
-	size_t raw_pos_after=0;
-	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, 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);
-		}
+		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);
 	}
 
-	Table& table=*new Table(columns);
+	Table& table=*new(pool) Table(pool, &method_name, columns);
 	// parse cells
-
-	ArrayString rows;
-	data.split(rows, raw_pos_after, "\n", String::L_AS_IS);
-	Array_iterator<const String*> 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);
-		const String&  string=*i.next();
+		Array& row=*new(pool) Array(pool);
+		const String& string=*i.next_string();
 		// remove comment lines
-		if(!string.length())
+		if(!string.size())
 			continue;
 
-		size_t col_pos_after=0;
-		string.split(*row, col_pos_after, "\t", String::L_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, MethodParams* params) {
-	const String&  first_param=params->as_string(0, "file name must be string");
+static void _load(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+	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;
+	int options_param_index=filename_param_index+1;
 	
 	// loading text
-	char *data=file_read_text(r.charsets.source(),
+	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():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 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 {
-				*columns+=new String(lsplit(&row_chars, '\t'), 0, true);
+				String *name=new(pool) String(pool);
+				name->APPEND_TAINTED(lsplit(&row_chars, '\t'), 0, file, line++);
+				*columns+=name;
 			} while(row_chars);
 
 			break;
@@ -182,53 +166,61 @@ static void _load(Request& r, MethodPara
 	}
 
 	// parse cells
-	Table& table=*new Table(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')) {
-			*row+=new String(cell_chars, 0, true);
+			String *cell=new(pool) String(pool);
+			cell->APPEND_TAINTED(cell_chars, 0, file, line);
+			*row+=cell;
 		}
+#ifndef NO_STRING_ORIGIN
+		line++;
+#endif
 		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, MethodParams* params) {
-	Value& vfile_name=params->as_no_junction(params->count()-1, "file name must not be code");
+static void _save(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+	Value& vfile_name=params->as_no_junction(params->size()-1, 
+		"file name must not be code");
 
-	Table& table=GET_SELF(r, VTable).table();
+	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
-			for(Array_iterator<const String*> i(*table.columns()); i.has_next(); ) {
-				sdata.append(*i.next(), String::L_TABLE);
+			Array_iter i(*table.columns());
+			while(i.has_next()) {
+				sdata.append(*i.next_string(), //*static_cast<String *>(table.columns()->quick_get(column)), 
+					String::UL_TABLE);
 				if(i.has_next())
-					sdata.append_help_length("\t", 1, String::L_CLEAN);
+					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=new(PointerFreeGC) char[MAX_NUMBER];
-					sdata.append_help_length(cindex_tab, 
-						snprintf(cindex_tab, MAX_NUMBER, "%d\t", column),
-						String::L_CLEAN);
+					char *cindex_tab=(char *)pool.malloc(MAX_NUMBER);
+					snprintf(cindex_tab, MAX_NUMBER, "%d\t", column);
+					sdata.APPEND_CONST(cindex_tab);
 				}
 			else
-				sdata.append_help_length("empty nameless table", 0, String::L_CLEAN);
+				sdata.APPEND_CONST("empty nameless table");
 		}
-		sdata.append_help_length("\n", 1, String::L_CLEAN);
+		sdata.APPEND_CONST("\n");
 	} else { // mode specified
-		const String&  mode=params->as_string(0, "mode must be string");
+		const String& mode=params->as_string(0, "mode must be string");
 		if(mode=="append")
 			do_append=true;
 		else if(mode=="nameless")
@@ -240,37 +232,43 @@ static void _save(Request& r, MethodPara
 
 	}
 	// data lines
-	Array_iterator<ArrayString*> i(table);
+	Array_iter i(table);
 	while(i.has_next()) {
-		for(Array_iterator<const String*> c(*i.next()); c.has_next(); ) {
-			sdata.append(*c.next(), String::L_TABLE);
+		Array_iter c(*static_cast<Array *>(i.next()));
+		while(c.has_next()) {
+			if(const String *s=c.next_string())
+				sdata.append(*s,
+					String::UL_TABLE);
 			if(c.has_next())
-				sdata.append_help_length("\t", 1, String::L_CLEAN);
+				sdata.APPEND_CONST("\t");
 		}
-		sdata.append_help_length("\n", 1, String::L_CLEAN);
+		sdata.APPEND_CONST("\n");
 	}
 
 	// write
 	file_write(r.absolute(vfile_name.as_string()), 
-		sdata.cstr(), sdata.length(), true, do_append);
+		sdata.cstr(), sdata.size(), true, do_append);
 }
 
-static void _count(Request& r, MethodParams* ) {
-	int result=GET_SELF(r, VTable).table().count();
-	r.write_no_lang(*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, MethodParams* ) {
-	int result=1+GET_SELF(r, VTable).table().current();
-	r.write_no_lang(*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, MethodParams* params) {
-	Table& table=GET_SELF(r, VTable).table();
-	if(params->count()) {
+static void _offset(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+	Table& table=static_cast<VTable *>(r.get_self())->table(&method_name);
+	if(params->size()) {
 		bool absolute=false;
-		if(params->count()>1) {
-		    const String&  whence=params->as_string(0, "whence must be string");
+		if(params->size()>1) {
+		    const String& whence=params->as_string(0, "whence must be string");
 		    if(whence=="cur")
 				absolute=false;
 		    else if(whence=="set")
@@ -281,27 +279,27 @@ static void _offset(Request& r, MethodPa
 					"is invalid whence, valid are 'cur' or 'set'");
 		}
 		
-		Value& offset_expr=params->as_junction(params->count()-1, "offset must be expression");
+		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(*new VInt(table.current()));
+		r.write_no_lang(*new(pool) VInt(pool, table.current()));
 }
 
-static void _menu(Request& r, MethodParams* params) {
+static void _menu(Request& r, const String& method_name, MethodParams *params) {
 	Value& body_code=params->as_junction(0, "body must be code");
 	
-	Value* delim_maybe_code=params->count()>1?(*params)[1]:0;
+	Value *delim_maybe_code=params->size()>1?&params->get(1):0;
 
-	Table& table=GET_SELF(r, VTable).table();
+	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);
-		const String* s_processed=sv_processed.get_string();
-		if(delim_maybe_code && s_processed && s_processed->length()) { // delimiter set and we have body
+		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));
 			need_delim=true;
@@ -312,123 +310,160 @@ static void _menu(Request& r, MethodPara
 }
 
 #ifndef DOXYGEN
+enum Table2hash_distint { D_ILLEGAL, D_FIRST, D_TABLES };
 struct Row_info {
 	Request *r;
 	Table *table;
-	Value* key_code;
-	size_t key_field;
-	Array<int>* value_fields;
-	HashStringValue* hash;
-	bool distinct;
-	size_t row;
+	Value *key_code;
+	int key_field;
+	Array *value_fields;
+	Hash *hash;
+	Table2hash_distint distinct;
+	int row;
 };
 #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);
+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):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]
 		
-	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)));
+	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=new(pool) Table(pool, *ri.table, 0, -1 /*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, 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) {
-			bool distinct=false;
-			int param_index=params->count()-1;
+static void _hash(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+	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()) {
+				if(Hash *options=
+					params->as_no_junction(param_index, "param must not be code").get_hash(0)) {
 					--param_index;
 					int valid_options=0;
-					if(Value* 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",
-							0,
+							&method_name,
 							"called with invalid option");
 				}
 			}
 			if(param_index==2) // bad options param type
 				throw Exception("parser.runtime",
-					0,
+					&method_name,
 					"options must be hash");
 
-			Array<int> value_fields;
+			Array value_fields(pool);
 			if(param_index>0) {
+				if(distinct!=D_ILLEGAL && distinct!=D_FIRST)
+					throw Exception("parser.runtime",
+						0,
+						"in distinct[tables] mode you may not specify value field(s)");
 				Value& value_fields_param=params->as_no_junction(param_index, "value field(s) must not be code");
 				if(value_fields_param.is_string()) {
-					value_fields+=self_table.column_name2index(
-						*value_fields_param.get_string(), true);
-				} else if(Table* value_fields_table=value_fields_param.get_table()) {
-					for(Array_iterator<Table::element_type> i(*value_fields_table); 
-						i.has_next(); ) {
-						const String& value_field_name
-							=*i.next()->get(0);
-						value_fields
-							+=self_table.column_name2index(value_field_name, true);
+					value_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",
-						0,
+						&method_name,
 						"value field(s) must be string or self_table"
 					);
 			} else { // by all columns, including key
-				for(size_t 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;
-				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);
-			}
+			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 {
-	ArrayString* row;
+	Array *row;
 	union {
-		const char *c_str;
+		char *c_str;
 		double d;
 	} value;
 };
@@ -449,60 +484,61 @@ static int sort_cmp_double(const void *a
 	else 
 		return 0;
 }
-static void _sort(Request& r, MethodParams* params) {
+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|]*/?
+	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();
-	Table& new_table=*new Table(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());
 
-	Table_seq_item* seq=new(PointerFreeGC) 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;
-	int old_count=old_table.count();
-	for(i=0; i<old_count; i++) {
+	for(i=0; i<old_table.size(); i++) {
 		old_table.set_current(i);
 		// calculate key value
-		seq[i].row=old_table[i];
-		Value* value=r.process_to_value(key_maker).as_expr_result(true/*return string as-is*/);
+		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().cstr();
+			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_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_count; i++)
-		new_table+=Table::element_type(seq[reverse?old_count-1-i:i].row);
-
-	delete[] seq;
+	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, MethodParams* params) {
-	if(params->count()>1)
+static bool _locate_expression(Request& r, const String& method_name, MethodParams *params) {
+	if(params->size()>1)
 		throw Exception("parser.runtime", 
-			0,
+			&method_name,
 			"locate by expression has only one parameter - expression");
 
 	Value& expression_code=params->as_junction(0, "must be expression");
 
-	Table& table=GET_SELF(r, VTable).table();
+	Table& table=static_cast<VTable *>(r.get_self())->table(&method_name);
 	int saved_current=table.current();
-	int size=table.count();
+	int size=table.size();
 	for(int row=0; row<size; row++) {
 		table.set_current(row);
 
@@ -512,110 +548,122 @@ static bool _locate_expression(Request&
 	table.set_current(saved_current);
 	return false;
 }
-static bool _locate_name_value(Request& r, MethodParams* params) {
-	if(params->count()>2)
+static bool _locate_name_value(Request& r, const String& method_name, MethodParams *params) {
+	if(params->size()>2)
 		throw Exception("parser.runtime", 
-			0,
+			&method_name,
 			"locate by name and value has only two parameters - name and value");
 
-	Table& table=GET_SELF(r, VTable).table();
+	Table& table=static_cast<VTable *>(r.get_self())->table(&method_name);
 	return table.locate(
 		params->as_string(0, "column name must be string"),
 		params->as_string(1, "value must be string")
 	);
 }
-static void _locate(Request& r, MethodParams* params) {
-	bool result=(*params)[0]->get_junction()?
-		_locate_expression(r, params) :
-		_locate_name_value(r, params);
-	r.write_no_lang(*new VBool(result));
-}
-
-static void _flip(Request& r, MethodParams* params) {
-	Table& old_table=GET_SELF(r, VTable).table();
-	Table& new_table=*new Table(old_table.columns());
-	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;
+static void _locate(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+	bool result=params->get(0).get_junction()?
+		_locate_expression(r, method_name, params) :
+		_locate_name_value(r, method_name, params);
+	r.write_no_lang(*new(pool) VBool(pool, result));
+}
+
+static void _flip(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+	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++) {
+				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(*new VTable(&new_table));
+	r.write_no_lang(*new(pool) VTable(pool, &new_table));
 }
 
-static void _append(Request& r, MethodParams* params) {
+static void _append(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
 	// 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"));
+	Temp_lang temp_lang(r, String::UL_PASS_APPENDED);
+	const String& string=
+		r.process_to_string(params->as_junction(0, "body must be code"));
 
 	// parse cells
-	Table::element_type row=new ArrayString;
-	size_t pos_after=0;
-	string.split(*row, pos_after, "\t", String::L_AS_IS);
+	Array& row=*new(pool) Array(pool);
+	string.split(row, 0, "\t", 1, String::UL_AS_IS);
 
-	GET_SELF(r, VTable).table()+=row;
+	static_cast<VTable *>(r.get_self())->table(&method_name)+=&row;
 }
 
-static void _join(Request& r, MethodParams* params) {
-	Table* maybe_src=params->as_no_junction(0, "table ref must not be code").get_table();
+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();
 	if(!maybe_src)
 		throw Exception("parser.runtime", 
-			0, 
+			&method_name, 
 			"source is not a table");
 
 	Table& src=*maybe_src;
-	Table& dest=GET_SELF(r, VTable).table();
+	Table& dest=static_cast<VTable *>(r.get_self())->table(&method_name);
 	if(&src == &dest)
 		throw Exception("parser.runtime", 
-			0, 
+			&method_name, 
 			"source and destination are same table");
 
 	int offset, limit;
-	get_copy_options(r, params, 1, src, 
+	get_copy_options(r, method_name, params, 1, src, 
 		offset, limit);
 
-	if(Table::columns_type dest_columns=dest.columns()) { // dest is named
+	if(const Array *dest_columns=dest.columns()) { // dest is named
 		int saved_src_current=src.current();
-		int m=src.count()-offset;
+		int m=src.size()-offset;
 		if(!limit || limit>m)
 			limit=m;
 		int end=offset+limit;
 		for(int src_row=offset; src_row<end; src_row++) {
 			src.set_current(src_row);
-			Table::element_type dest_row(new ArrayString(src.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;
+			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
-		size_t src_count=src.count();
-		for(size_t 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 {
-	ArrayString& columns;
-	ArrayString* row;
-public:
-	Table* table;
 public:
-	Table_sql_event_handlers() :
-		columns(*new ArrayString), row(0), table(0) {
+	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(pool) Array(pool)),
+		row(0), 
+		table(0)
+	{
 	}
 
-	bool add_column(SQL_Error& error, const char *str, size_t size) {
+	bool add_column(SQL_Error& error, void *ptr, size_t size) {
 		try {
-			columns+=new String(str, size, true);
+			String *column=new(pool) String(pool);
+			column->APPEND_TAINTED(
+				(const char *)ptr, size, 
+				statement_cstr, 0);
+			columns+=column;
 			return false;
 		} catch(...) {
 			error=SQL_Error("exception occured in Table_sql_event_handlers::add_column");
@@ -624,7 +672,7 @@ public:
 	}
 	bool before_rows(SQL_Error& error) { 
 		try {
-			table=new Table(&columns);
+			table=new(pool) Table(pool, &method_name, &columns);
 			return false;
 		} catch(...) {
 			error=SQL_Error("exception occured in Table_sql_event_handlers::before_rows");
@@ -633,66 +681,80 @@ public:
 	}
 	bool add_row(SQL_Error& error) {
 		try {
-			*table+=row=new ArrayString;
+			(*table)+=(row=new(pool) Array(pool));
 			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 size) {
+	bool add_row_cell(SQL_Error& error, void *ptr, size_t size) {
 		try {
-			String& cell=*new String;
+			String *cell=new(pool) String(pool);
 			if(size)
-				cell.append_help_length(str, size, String::L_TAINTED);
-			*row+=&cell;
+				cell->APPEND_TAINTED(
+					(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, MethodParams* params) {
+static void _sql(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+
 	Value& statement=params->as_junction(0, "statement must be code");
 
 	ulong limit=0;
 	ulong offset=0;
-	if(params->count()>1) {
+	if(params->size()>1) {
 		Value& voptions=params->as_no_junction(1, "options must be hash, not code");
 		if(!voptions.is_string())
-			if(HashStringValue* options=voptions.get_hash()) {
+			if(Hash *options=voptions.get_hash(&method_name)) {
 				int valid_options=0;
-				if(Value* 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();
 				}
-				if(Value* 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();
 				}
-				if(valid_options!=options->count())
+				if(valid_options!=options->size())
 					throw Exception("parser.runtime",
-						0,
+						&method_name,
 						"called with invalid option");
 			} else
 				throw Exception("parser.runtime",
-					0,
+					&method_name,
 					"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;
+	Temp_lang temp_lang(r, String::UL_SQL);
+	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
 	struct timeval mt[2];
 	//measure:before
 	gettimeofday(&mt[0],NULL);
 #endif	
-	r.connection()->query(
+	r.connection(&method_name)->query(
 		statement_cstr, offset, limit, 
 		handlers,
 		statement_string);
@@ -708,40 +770,47 @@ static void _sql(Request& r, MethodParam
 	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
+	Table *result=
+		handlers.table?handlers.table: // query resulted in table? return 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, MethodParams* ) {
+static void _columns(Request& r, const String& method_name, MethodParams *) {
+	Pool& pool=r.pool();
 
-	Table::columns_type result_columns(new ArrayString);
-	*result_columns+=new String("column");
-	Table& result_table=*new Table(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();
-	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;
+	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()) {
+			Array& result_row=*new(pool) Array(pool);
+			result_row+=i.next();
+			result_table+=&result_row;
 		}
 	}
 
-	r.write_no_lang(*new VTable(&result_table));
+	r.write_no_lang(*new(pool) VTable(pool, &result_table));
 }
 
-static void _select(Request& r, MethodParams* params) {
+static void _select(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+
 	Value& vcondition=params->as_junction(0, "condition must be expression");
 
-	Table& source_table=GET_SELF(r, VTable).table();
-	Table& result_table=*new Table(source_table.columns());
+	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);
 
@@ -750,16 +819,16 @@ static void _select(Request& r, MethodPa
 				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(*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]
@@ -821,3 +890,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);
+}