--- parser3/src/classes/table.C	2001/07/28 12:07:26	1.97
+++ parser3/src/classes/table.C	2002/04/18 10:51:00	1.151
@@ -1,15 +1,11 @@
 /** @file
 	Parser: @b table parser class.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+	$Id: table.C,v 1.151 2002/04/18 10:51:00 paf Exp $
 */
-static const char *RCSId="$Id: table.C,v 1.97 2001/07/28 12:07:26 parser Exp $"; 
-
-#include "pa_config_includes.h"
-
-#include "pcre.h"
 
 #include "classes.h"
 #include "pa_common.h"
@@ -17,13 +13,8 @@ static const char *RCSId="$Id: table.C,v
 #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 {
@@ -39,13 +30,19 @@ public: // Methoded
 
 // methods
 
-static void _set(Request& r, const String& method_name, MethodParams *params) {
+static void _create(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	// data is last parameter
-	Value& vdata=params->as_junction(params->size()-1, "body must be code");
+	// clone?
+	if(params->size()==1) 
+		if(const Table *source=params->get(0).get_table()) {
+			static_cast<VTable *>(r.self)->set_table(*new(pool) Table(*source));
+			return;
+		}
 
+	// data is last parameter
 	Temp_lang temp_lang(r, String::UL_PASS_APPENDED);
-	const String& data=r.process(vdata).as_string();
+	const String& data=
+		r.process_to_string(params->as_junction(params->size()-1, "body must be code"));
 
 	size_t pos_after=0;
 	// parse columns
@@ -56,24 +53,24 @@ static void _set(Request& r, const Strin
 		columns=new(pool) Array(pool);
 
 		Array head(pool);
-		data.split(head, &pos_after, "\n", 1, String::UL_CLEAN, 1);
+		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_CLEAN);
+			head.get_string(0)->split(*columns, 0, "\t", 1, String::UL_AS_IS);
 	}
 
 	Table& table=*new(pool) Table(pool, &method_name, 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++) {
+	data.split(rows, &pos_after, "\n", 1, String::UL_AS_IS);
+	Array_iter i(rows);
+	while(i.has_next()) {
 		Array& row=*new(pool) Array(pool);
-		const String& string=*rows.quick_get_string(i);
-		// remove empty lines
+		const String& string=*i.next_string();
+		// remove comment lines
 		if(!string.size())
 			continue;
 
-		string.split(row, 0, "\t", 1, String::UL_CLEAN);
+		string.split(row, 0, "\t", 1, String::UL_AS_IS);
 		table+=&row;
 	}
 
@@ -84,11 +81,11 @@ static void _set(Request& r, const Strin
 static void _load(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 	// filename is last parameter
-	Value& vfilename=params->as_no_junction(params->size()-1, 
+	Value& vfile_name=params->as_no_junction(params->size()-1, 
 		"file name must not be code");
 
 	// loading text
-	char *data=file_read_text(pool, r.absolute(vfilename.as_string()));
+	char *data=file_read_text(pool, r.absolute(vfile_name.as_string()));
 
 	// parse columns
 	Array *columns;
@@ -98,23 +95,30 @@ static void _load(Request& r, const Stri
 	uint line=origin.line;
 #endif
 	if(params->size()==2) {
-		columns=0;
+		columns=0; // nameless
 	} else {
 		columns=new(pool) Array(pool);
 
-		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;
 			} while(row_chars);
+
+			break;
+		}
 	}
 
 	// parse cells
 	Table& table=*new(pool) Table(pool, &method_name, columns);
 	char *row_chars;
 	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);
 		while(char *cell_chars=lsplit(&row_chars, '\t')) {
@@ -122,7 +126,9 @@ static void _load(Request& r, const Stri
 			cell->APPEND_TAINTED(cell_chars, 0, file, line);
 			*row+=cell;
 		}
+#ifndef NO_STRING_ORIGIN
 		line++;
+#endif
 		table+=row;
 	};
 
@@ -130,142 +136,30 @@ static void _load(Request& r, const Stri
 	static_cast<VTable *>(r.self)->set_table(table);
 }
 
-static Table *fill_month_days(Request& r, 
-							  const String& method_name, MethodParams *params, bool rus){
-	Pool& pool=r.pool();
-	Table *result=new(pool) Table(pool, &method_name, 0/*&columns*/);
-
-    int year=params->as_int(1, r);
-    int month=max(1, min(params->as_int(2, r), 12)) -1;
-
-    tm tmIn={0, 0, 0, 1, month, year-1900};
-    time_t t=mktime(&tmIn);
-	if(t<0)
-		PTHROW(0, 0, 
-			&method_name, 
-			"invalid date");
-    tm *tmOut=localtime(&t);
-
-    int weekDay1=tmOut->tm_wday;
-	if(rus) 
-		weekDay1=weekDay1?weekDay1-1:6; //sunday last
-    int monthDays=getMonthDays(year, month);
-    
-    for(int _day=1-weekDay1; _day<=monthDays;) {
-		Array& row=*new(pool) Array(pool, 7);
-    	for(int wday=0; wday<7; wday++, _day++) {
-        	String *cell=new(pool) String(pool);
-			if(_day>=1 && _day<=monthDays) {
-				char *buf=(char *)malloc(2+1); 
-				cell->APPEND_CLEAN(buf, sprintf(buf, "%02d", _day), 
-					method_name.origin().file, method_name.origin().line);
-            }
-			row+=cell;            
-        }
-    	*result+=&row;
-    }
-    
-    return result;
-}
-
-static Table *fill_week_days(Request& r, 
-							 const String& method_name, MethodParams *params, bool rus){
-	Pool& pool=r.pool();
-	Array& columns=*new(pool) Array(pool, 4);
-	columns+=new(pool) String(pool, "year");
-	columns+=new(pool) String(pool, "month");
-	columns+=new(pool) String(pool, "day");
-	columns+=new(pool) String(pool, "weekday");
-	Table *result=new(pool) Table(pool, &method_name, &columns);
-
-    int year=params->as_int(1, r);
-    int month=max(1, min(params->as_int(2, r), 12)) -1;
-    int day=params->as_int(3, r);
-    
-    tm tmIn={0, 0, 18, day, month, year-1900};
-    time_t t=mktime(&tmIn);
-	if(t<0)
-		PTHROW(0, 0, 
-			&method_name, 
-			"invalid date");
-    tm *tmOut=localtime(&t);
-    
-    int baseWeekDay=tmOut->tm_wday;
-	if(rus) 
-		baseWeekDay=baseWeekDay?baseWeekDay-1:6; //sunday last
-
-    t-=baseWeekDay*SECS_PER_DAY;
-
-    for(int curWeekDay=0; curWeekDay<7; curWeekDay++, t+=SECS_PER_DAY) {
-        tm *tmOut=localtime(&t);
-		Array& row=*new(pool) Array(pool, 4);
-#define WDFILL(size, value) { \
-		char *buf=(char *)malloc(size+1); \
-		String *cell=new(pool) String(pool); \
-		cell->APPEND_CLEAN(buf, sprintf(buf, "%0"#size"d", value), \
-			method_name.origin().file, \
-			method_name.origin().line); \
-		row+=cell; \
-		}
-		WDFILL(4, 1900+tmOut->tm_year);
-		WDFILL(2, 1+tmOut->tm_mon);
-		WDFILL(2, tmOut->tm_mday);
-		WDFILL(2, tmOut->tm_wday);
-        *result+=&row;
-    }
-    
-    return result;
-}
-
-static void _calendar(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
-
-	const String& what=params->as_string(0, "format must be strig");
-	bool rus=false;
-	if(what=="rus")
-		rus=true;
-	else if(what=="eng")
-		rus=false;
-	else
-		PTHROW(0, 0, 
-			&what, 
-			"must be rus|eng");
-
-	Table *result=0;
-	if(params->size()==1+2) 
-		result=fill_month_days(r, method_name, params, rus);
-	else // 1+3
-		result=fill_week_days(r, method_name, params, rus);
-
-	// replace any previous table value
-	static_cast<VTable *>(r.self)->set_table(*result);
-}
-
-
-
-
+/// @todo "x\nx" "xxx""xx"
 static void _save(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	Value& vtable_name=params->as_no_junction(params->size()-1, 
+	Value& vfile_name=params->as_no_junction(params->size()-1, 
 		"file name must not be code");
 
 	Table& table=static_cast<VTable *>(r.self)->table();
 
+	bool do_append=false;
 	String sdata(pool);
-	if(params->size()==1) { // not nameless=named output
+	if(params->size()==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)), 
+			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_CONST("\t");
 			}
 		} else { // nameless table
-			int lsize=table.size()?static_cast<Array *>(table.get(0))->size():0;
-			if(lsize)
+			if(int lsize=table.size()?static_cast<Array *>(table.get(0))->size():0)
 				for(int column=0; column<lsize; column++) {
-					char *cindex_tab=(char *)malloc(MAX_NUMBER);
+					char *cindex_tab=(char *)pool.malloc(MAX_NUMBER);
 					snprintf(cindex_tab, MAX_NUMBER, "%d\t", column);
 					sdata.APPEND_CONST(cindex_tab);
 				}
@@ -273,89 +167,103 @@ static void _save(Request& r, const Stri
 				sdata.APPEND_CONST("empty nameless table");
 		}
 		sdata.APPEND_CONST("\n");
+	} 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)), 
+	Array_iter i(table);
+	while(i.has_next()) {
+		Array_iter c(*static_cast<Array *>(i.next()));
+		while(c.has_next()) {
+			sdata.append(*c.next_string(), //*static_cast<String *>(row->quick_get(column)), 
 				String::UL_TABLE);
+			if(c.has_next())
+				sdata.APPEND_CONST("\t");
 		}
 		sdata.APPEND_CONST("\n");
 	}
 
 	// write
-	file_write(pool, r.absolute(vtable_name.as_string()), 
-		sdata.cstr(), sdata.size(), true);
+	file_write(r.absolute(vfile_name.as_string()), 
+		sdata.cstr(), sdata.size(), true, do_append);
 }
 
 static void _count(Request& r, const String& method_name, MethodParams *) {
 	Pool& pool=r.pool();
-	Value& value=*new(pool) VInt(pool, static_cast<VTable *>(r.self)->table().size());
-	value.set_name(method_name);
-	r.write_no_lang(value);
+	int result=static_cast<VTable *>(r.self)->table().size();
+	r.write_no_lang(*new(pool) VInt(pool, result));
 }
 
 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());
-	value.set_name(method_name);
-	r.write_no_lang(value);
+	int result=1+static_cast<VTable *>(r.self)->table().current();
+	r.write_no_lang(*new(pool) VInt(pool, result));
 }
 
 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()) {
-		Value& offset_expr=params->as_junction(0, "offset must be expression");
-		table.shift(r.process(offset_expr).as_int());
-	} else {
-		Value& value=*new(pool) VInt(pool, table.current());
-		value.set_name(method_name);
-		r.write_no_lang(value);
-	}
+		bool absolute=false;
+		if(params->size()>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->size()-1, "offset must be expression");
+		table.offset(absolute, r.process_to_value(offset_expr).as_int());
+	} else
+		r.write_no_lang(*new(pool) VInt(pool, table.current()));
 }
 
 static void _menu(Request& r, const String& method_name, 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->size()>1?&params->get(1):0;
 
-	VTable& vtable=*static_cast<VTable *>(r.self);
-	Table& table=vtable.table();
+	Table& table=static_cast<VTable *>(r.self)->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.size();
+	for(int row=0; row<size; row++) {
 		table.set_current(row);
 
-		Value& processed_body=r.process(body_code);
-		if(delim_code) { // delimiter set?
+		StringOrValue processed_body=r.process(body_code);
+		if(delim_maybe_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));
+				r.write_pass_lang(r.process(*delim_maybe_code));
 			need_delim=true;
 		}
 		r.write_pass_lang(processed_body);
 	}
-	table.set_current(saved_current); vtable.unlock();
+	table.set_current(saved_current);
 }
 
-static void _empty(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
-	Table& table=static_cast<VTable *>(r.self)->table();
-	
-	r.write_no_lang(*new(pool) VBool(pool, table.size()==0));
-}
-
-/// used by table: _hash / table_row_to_hash
+#ifndef DOXYGEN
 struct Row_info {
 	Table *table;
 	int key_field;
 	Array *value_fields;
 	Hash *hash;
 };
+#endif
 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);
@@ -363,7 +271,7 @@ static void table_row_to_hash(Array::Ite
 
 	if(ri.key_field<row.size()) {
 		VHash& result=*new(pool) VHash(pool);
-		Hash& hash=*result.get_hash();
+		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())
@@ -377,40 +285,43 @@ static void table_row_to_hash(Array::Ite
 }
 static void _hash(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	Table& table=static_cast<VTable *>(r.self)->table();
+	Table& self_table=static_cast<VTable *>(r.self)->table();
 	Value& result=*new(pool) VHash(pool);
-	if(const Array *columns=table.columns()) 
+	if(const Array *columns=self_table.columns()) 
 		if(columns->size()>1) {
-
 			const String& key_field_name=params->as_no_junction(0, 
 				"key field name must not be code").as_string();
-			int key_field=table.column_name2index(key_field_name, true);
-			int value_fields_count=params->size()-1;
-			bool value_fields_by_params=value_fields_count!=0;
-			if(!value_fields_by_params)
-				value_fields_count=columns->size()-1; // all columns except key
-			Array value_fields(pool, value_fields_count);
-			if(value_fields_by_params) {
-				for(int i=1; i<params->size(); i++) {
-					const String& value_field_name=params->as_no_junction(i, 
-						"value field name must not be code").as_string();
-					value_fields+=table.column_name2index(value_field_name, true);
-				}
-			} else { // by all columns except key
+			int key_field=self_table.column_name2index(key_field_name, true);
+
+			Array value_fields(pool);
+			if(params->size()>1) {
+				Value& value_fields_param=params->as_no_junction(1, "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,
+						"value field(s) must be string or self_table"
+					);
+			} else { // by all columns, including key
 				for(int i=0; i<columns->size(); i++)
-					if(i!=key_field)
-						value_fields+=i;
+					value_fields+=i;
 			}
 
 			// integers: key_field & value_fields
-			Row_info row_info={&table, key_field, &value_fields, result.get_hash()};
-			table.for_each(table_row_to_hash, &row_info);
+			Row_info row_info={&self_table, key_field, &value_fields, result.get_hash(0)};
+			self_table.for_each(table_row_to_hash, &row_info);
 		}
-	result.set_name(method_name);
 	r.write_no_lang(result);
 }
 
-/// used by table: _sort / sort_cmp_string|sort_cmp_double
+#ifndef DOXYGEN
 struct Table_seq_item {
 	Array *row;
 	union {
@@ -418,6 +329,7 @@ struct Table_seq_item {
 		double d;
 	} value;
 };
+#endif
 static int sort_cmp_string(const void *a, const void *b) {
 	return strcmp(
 		static_cast<const Table_seq_item *>(a)->value.c_str, 
@@ -435,28 +347,28 @@ static int sort_cmp_double(const void *a
 		return 0;
 }
 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->size()==2/*..[asc|desc]*/?
+	bool reverse=params->size()>1/*..[desc|asc|]*/?
 		reverse=params->as_no_junction(1, "order must not be code").as_string()=="desc":
-		false;
+		false; // default=asc
 
-	Table& table=static_cast<VTable *>(r.self)->table();
-
-	// anything to sort?
-	if(!table.size())
-		return;
+	Table& old_table=static_cast<VTable *>(r.self)->table();
+	Table& new_table=*new(pool) Table(pool, &method_name, old_table.columns());
 
-	Table_seq_item *seq=(Table_seq_item *)malloc(sizeof(Table_seq_item)*table.size());
+	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<table.size(); i++) {
-		table.set_current(i);
+	// save 'current'
+	int saved_current=old_table.current();
+	for(i=0; i<old_table.size(); 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=(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();
 
@@ -465,35 +377,63 @@ static void _sort(Request& r, const Stri
 		else
 			seq[i].value.d=value.as_double();
 	}
+	// restore 'current'
+	old_table.set_current(saved_current);
 	// sort keys
-	_qsort(seq, table.size(), 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<table.size(); i++)
-		table.put(i, seq[reverse?table.size()-1-i:i].row);
+	for(i=0; i<old_table.size(); i++)
+		new_table+=seq[reverse?old_table.size()-1-i:i].row;
 
-	// reset 'current'
-	table.set_current(0);
+	// replace any previous table value
+	static_cast<VTable *>(r.self)->set_table(new_table);
 }
 
+static bool _locate_expression(Request& r, const String& method_name, MethodParams *params) {
+	if(params->size()>1)
+		throw Exception("parser.runtime", 
+			&method_name,
+			"locate by expression has only one parameter - expression");
+
+	Value& expression_code=params->as_junction(0, "must be expression");
+
+	Table& table=static_cast<VTable *>(r.self)->table();
+	int saved_current=table.current();
+	int size=table.size();
+	for(int row=0; row<size; row++) {
+		table.set_current(row);
+
+		if(r.process_to_value(expression_code).as_bool())
+			return true;
+	}
+	table.set_current(saved_current);
+	return false;
+}
+static bool _locate_name_value(Request& r, const String& method_name, MethodParams *params) {
+	if(params->size()>2)
+		throw Exception("parser.runtime", 
+			&method_name,
+			"locate by name and value has only two parameters - name and value");
+
+	Table& table=static_cast<VTable *>(r.self)->table();
+	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, 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);
+	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();
-	VTable& vtable=*static_cast<VTable *>(r.self);
-
-	Table& old_table=*vtable.get_table();
+	Table& old_table=static_cast<VTable *>(r.self)->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()) 
@@ -501,29 +441,26 @@ static void _flip(Request& r, const Stri
 				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;
+					new_row+=column<old_row.size()?old_row.get(column):new(pool) String(pool);
 				}
 				new_table+=&new_row;
 			}
 
-	vtable.set_table(new_table);
+	r.write_no_lang(*new(pool) VTable(pool, &new_table));
 }
 
 static void _append(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	// data is last parameter
+	// data
+	Temp_lang temp_lang(r, String::UL_PASS_APPENDED);
 	const String& string=
-		r.process(params->as_junction(0, "body must be code")).as_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);
+	string.split(row, 0, "\t", 1, String::UL_AS_IS);
 
-	VTable& vtable=*static_cast<VTable *>(r.self);
-	// disable ^a.menu{^a.append[]}
-	vtable.lock();
-	vtable.table()+=&row;
-	vtable.unlock();
+	static_cast<VTable *>(r.self)->table()+=&row;
 }
 
 static void _join(Request& r, const String& method_name, MethodParams *params) {
@@ -531,14 +468,14 @@ static void _join(Request& r, const Stri
 
 	Table *maybe_src=params->as_no_junction(0, "table ref must not be code").get_table();
 	if(!maybe_src)
-		PTHROW(0, 0, 
+		throw Exception("parser.runtime", 
 			&method_name, 
 			"source is not a table");
 
 	Table& src=*maybe_src;
 	Table& dest=static_cast<VTable *>(r.self)->table();
 	if(&src == &dest)
-		PTHROW(0, 0, 
+		throw Exception("parser.runtime", 
 			&method_name, 
 			"source and destination are same table");
 
@@ -547,8 +484,10 @@ static void _join(Request& r, const Stri
 		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));
+			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;
 		}
 		src.set_current(saved_src_current);
@@ -568,7 +507,7 @@ public:
 		statement_string(astatement_string),
 		statement_cstr(astatement_cstr),
 		columns(*new(pool) Array(pool)),
-		row(0), row_index(0),
+		row(0), 
 		table(0)
 	{
 	}
@@ -591,7 +530,7 @@ public:
 		if(size)
 			cell->APPEND_TAINTED(
 				(const char *)ptr, size, 
-				statement_cstr, row_index++);
+				statement_cstr, table->size()-1);
 		(*row)+=cell;
 	}
 
@@ -601,7 +540,6 @@ private:
 	const String& statement_string; const char *statement_cstr;
 	Array& columns;
 	Array *row;
-	uint row_index;
 public:
 	Table *table;
 };
@@ -609,45 +547,56 @@ public:
 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->as_junction(0, "statement must be code");
 
 	ulong limit=0;
-	if(params->size()>1) {
-		Value& limit_code=params->as_junction(1, "limit must be expression");
-		limit=(uint)r.process(limit_code).as_double();
-	}
-
 	ulong offset=0;
-	if(params->size()>2) {
-		Value& offset_code=params->as_junction(2, "offset must be expression");
-		offset=(ulong)r.process(offset_code).as_double();
+	if(params->size()>1) {
+		Value& voptions=params->as_no_junction(1, "options must be hash, not code");
+		if(voptions.is_defined())
+			if(Hash *options=voptions.get_hash(&method_name)) {
+				if(Value *vlimit=(Value *)options->get(*sql_limit_name))
+					limit=(ulong)r.process_to_value(*vlimit).as_double();
+				if(Value *voffset=(Value *)options->get(*sql_offset_name))
+					offset=(ulong)r.process_to_value(*voffset).as_double();
+			} else
+				throw Exception("parser.runtime",
+					&method_name,
+					"options must be hash");
 	}
 
 	Temp_lang temp_lang(r, String::UL_SQL);
-	const String& statement_string=r.process(statement).as_string();
+	const String& statement_string=r.process_to_string(statement);
 	const char *statement_cstr=
-		statement_string.cstr(String::UL_UNSPECIFIED, r.connection);
+		statement_string.cstr(String::UL_UNSPECIFIED, r.connection(&method_name));
 	Table_sql_event_handlers handlers(pool, method_name,
 		statement_string, statement_cstr);
-	bool need_rethrow=false; Exception rethrow_me;
-	PTRY {
-		r.connection->query(
+	try {
+#ifdef RESOURCES_DEBUG
+	struct timeval mt[2];
+	//measure:before
+	gettimeofday(&mt[0],NULL);
+#endif	
+		r.connection(&method_name)->query(
 			statement_cstr, offset, limit, 
 			handlers);
+	
+#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	    			
+	} catch(const Exception& e) { // query problem
+		// more specific source [were url]
+		throw Exception("sql.execute", 
+			&statement_string, 
+			"%s", e.comment());
 	}
-	PCATCH(e) { // query 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());
 
 	Table *result=
 		handlers.table?handlers.table: // query resulted in table? return it
@@ -657,81 +606,6 @@ static void _sql(Request& r, const Strin
 	static_cast<VTable *>(r.self)->set_table(*result);
 }
 
-static void _dir(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
-
-	Value& relative_path=params->as_no_junction(0, "path must not be code");
-
-	const String *regexp;
-	pcre *regexp_code;
-	int ovecsize;
-	int *ovector;
-	if(params->size()>1) {
-		regexp=&params->as_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);
-			}
-		}
-
-		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;
-		}
-	);
-
-	if(regexp_code)
-		(*pcre_free)(regexp_code);
-
-	// replace any previous table value
-	static_cast<VTable *>(r.self)->set_table(table);
-}
-
 static void _columns(Request& r, const String& method_name, MethodParams *) {
 	Pool& pool=r.pool();
 
@@ -741,35 +615,58 @@ static void _columns(Request& r, const S
 
 	Table& source_table=static_cast<VTable *>(r.self)->table();
 	if(const Array *source_columns=source_table.columns()) {
-		int size=source_columns->quick_size();
-		for(int i=0; i<size; i++) {
+		Array_iter i(*source_columns);
+		while(i.has_next()) {
 			Array& result_row=*new(pool) Array(pool);
-			result_row+=source_columns->quick_get(i);
+			result_row+=i.next();
 			result_table+=&result_row;
 		}
 	}
 
-	VTable& result=*new(pool) VTable(pool, &result_table);
-	result.set_name(method_name);
-	r.write_no_lang(result);
+	r.write_no_lang(*new(pool) VTable(pool, &result_table));
 }
 
-// constructor
+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");
 
-MTable::MTable(Pool& apool) : Methoded(apool) {
-	set_name(*NEW String(pool(), TABLE_CLASS_NAME));
+	Table& source_table=static_cast<VTable *>(r.self)->table();
+	Table& result_table=*new(pool) Table(pool, 
+		source_table.origin_string(), 
+		source_table.columns()
+	);
 
-	// ^table:set{data}
-	// ^table:set[nameless]{data}
-	add_native_method("set", Method::CT_DYNAMIC, _set, 1, 2);
+	int saved_current=source_table.current();
+	int size=source_table.size();
+	for(int row=0; row<size; row++) {
+		source_table.set_current(row);
 
-	// ^table:load[file]  
-	// ^table:load[nameless;file]
-	add_native_method("load", Method::CT_DYNAMIC, _load, 1, 2);
+		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.at(row); // =green light to go to result
+	}
+	source_table.set_current(saved_current);
+
+	r.write_no_lang(*new(pool) VTable(pool, &result_table));
+}
 
-	// ^table:calendar[month|montheng;year;month]  
-	// ^table:calendar[week|weekeng;year;month;day]
-	add_native_method("calendar", Method::CT_DYNAMIC, _calendar, 3, 4);
+// constructor
+
+MTable::MTable(Pool& apool) : Methoded(apool, "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, 2);
 
 	// ^table.save[file]  
 	// ^table.save[nameless;file]
@@ -782,26 +679,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[]
-	add_native_method("empty", Method::CT_DYNAMIC, _empty, 0, 0);
-
 	// ^table:hash[key field name]
-	// ^table:hash[key field name][value field name;...]
-	add_native_method("hash", Method::CT_DYNAMIC, _hash, 1, 1000);
+	// ^table:hash[key field name][value field name(s) string/table]
+	add_native_method("hash", Method::CT_DYNAMIC, _hash, 1, 2);
 
-	// ^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, 2);
 
 	// ^table.flip[]
 	add_native_method("flip", Method::CT_DYNAMIC, _flip, 0, 0);
@@ -813,15 +708,15 @@ MTable::MTable(Pool& apool) : Methoded(a
 	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:dir[path]
-	// ^table:dir[path][regexp]
-	add_native_method("dir", Method::CT_DYNAMIC, _dir, 1, 2);
+	// ^table:sql[query]
+	// ^table:sql[query][$.limit(1) $.offset(2)]
+	add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 2);
 
 	// ^table:columns[]
 	add_native_method("columns", Method::CT_DYNAMIC, _columns, 0, 0);
+
+	// ^table.select(expression) = table
+	add_native_method("select", Method::CT_DYNAMIC, _select, 1, 1);
 }
 
 // global variable