--- parser3/src/classes/table.C	2016/09/21 15:14:39	1.331
+++ parser3/src/classes/table.C	2024/11/16 02:57:05	1.372
@@ -1,10 +1,18 @@
 /** @file
 	Parser: @b table parser class.
 
-	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
-	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
+	Copyright (c) 2001-2024 Art. Lebedev Studio (http://www.artlebedev.com)
+	Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>
 */
 
+#include "pa_config_includes.h"
+
+#if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4) && !defined(PA_DEBUG_DISABLE_GC))
+#include <sstream>
+#include "../lib/gc/include/gc_allocator.h"
+#define USE_STRINGSTREAM
+#endif
+
 #include "classes.h"
 #include "pa_vmethod_frame.h"
 
@@ -16,13 +24,9 @@
 #include "pa_sql_connection.h"
 #include "pa_vbool.h"
 #include "pa_array.h"
+#include "pa_varray.h"
 
-#if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4))
-#include <sstream>
-#define USE_STRINGSTREAM
-#endif
-
-volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.331 2016/09/21 15:14:39 moko Exp $";
+volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.372 2024/11/16 02:57:05 moko Exp $";
 
 // class
 
@@ -37,16 +41,9 @@ public:
 
 DECLARE_CLASS_VAR(table, new MTable);
 
-#define TABLE_REVERSE_NAME "reverse"
-
 // globals
 
-String sql_bind_name(SQL_BIND_NAME);
-String sql_limit_name(PA_SQL_LIMIT_NAME);
-String sql_offset_name(PA_SQL_OFFSET_NAME);
-String sql_default_name(SQL_DEFAULT_NAME);
-String sql_distinct_name(SQL_DISTINCT_NAME);
-String sql_value_type_name(SQL_VALUE_TYPE_NAME);
+#define TABLE_REVERSE_NAME "reverse"
 String table_reverse_name(TABLE_REVERSE_NAME);
 
 // methods
@@ -73,19 +70,22 @@ static Table::Action_options get_action_
 				result.offset=source.current();
 			else
 				throw Exception(PARSER_RUNTIME, &soffset, "must be 'cur' string or expression");
-		} else 
-			result.offset=r.process_to_value(*voffset).as_int();
+		} else {
+			int offset=r.process(*voffset).as_int();
+			result.offset=offset < 0 ? 0 : offset;
+		}
 	}
 	if(Value* vlimit=options->get(sql_limit_name)) {
 		valid_options++;
-		result.limit=r.process_to_value(*vlimit).as_int();
+		int limit=r.process(*vlimit).as_int();
+		result.limit=limit < 0 ? 0: limit;
 	}
-	if(Value *vreverse=(Value *)options->get(table_reverse_name)) { 
+	if(Value *vreverse=(Value *)options->get(table_reverse_name)) {
 		valid_options++; 
-		result.reverse=r.process_to_value(*vreverse).as_bool(); 
+		result.reverse=r.process(*vreverse).as_bool(); 
 		if(result.reverse && !defined_offset) 
 			result.offset=source.count()-1; 
-	} 
+	}
 
 	if(valid_options!=options->count())
 		throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
@@ -203,12 +203,13 @@ static lsplit_sresult lsplit(char** stri
 						*(pos++)=0;
 						result.append(helper.extract(*string_ref));
 						if(*pos==encloser && helper.check_lang(pos)){ // double-encloser stands for encloser
-							*string_ref=pos++;
+							*string_ref=pos;
 						} else {
 							*string_ref=pos;
 							break;
 						}
 					}
+					pos++;
 				} else {
 					result.append(helper.extract(*string_ref));
 					*string_ref=0;
@@ -259,9 +260,9 @@ static void _create(Request& r, MethodPa
 
 	if(params.count()>1) {
 		if(params[0].is_string()){ // can be nameless only
-			const String& snameless=params.as_string(0, "called with more then 1 param, first param may be only string 'nameless' or junction");
+			const String& snameless=params.as_string(0, "called with more than 1 param, first param may be only string 'nameless' or junction");
 			if(snameless!="nameless")
-				throw Exception(PARSER_RUNTIME, &snameless, "table::create called with more then 1 param, first param may be only 'nameless'");
+				throw Exception(PARSER_RUNTIME, &snameless, "table::create called with more than 1 param, first param may be only 'nameless'");
 			nameless=true;
 			data_param_index++;
 		}
@@ -277,7 +278,6 @@ static void _create(Request& r, MethodPa
 	}
 
 	// data
-	Temp_lang temp_lang(r, String::L_PASS_APPENDED);
 	StringSplitHelper sdata(r.process_to_string(params.as_junction(data_param_index, "body must be table or code")));
 	char *data=sdata.base;
 
@@ -413,15 +413,11 @@ static void _load(Request& r, MethodPara
 
 	HashStringValue *options=0;
 	TableControlChars control_chars;
-	if(options_param_index<params.count()
-		&& (options=params.as_hash(options_param_index))) {
-		// cloning, so that we could change [to simplify checks on params inside file_read_text
-		options=new HashStringValue(*options);
+	if(options_param_index<params.count() && (options=params.as_hash(options_param_index)))
 		control_chars.load(*options);
-	}
 
 	// loading text
-	char *data=file_load_text(r, r.absolute(params.as_string(filename_param_index, FILE_NAME_MUST_BE_STRING)), true, options);
+	char *data=file_load_text(r, r.full_disk_path(params.as_string(filename_param_index, FILE_NAME_MUST_BE_STRING)), true, options);
 
 	Skip_lines_action skip_lines_action = (control_chars.separator=='#' || control_chars.encloser=='#') ? skip_empty_lines : skip_empty_and_comment_lines;
 
@@ -465,7 +461,6 @@ static void _load(Request& r, MethodPara
 }
 
 #ifdef USE_STRINGSTREAM
-#include "gc_allocator.h"
 
 typedef std::basic_stringstream<char, std::char_traits<char>, gc_allocator<char> > pa_stringstream;
 typedef std::basic_string<char, std::char_traits<char>, gc_allocator<char> > pa_string;
@@ -494,15 +489,15 @@ static void table_to_csv(pa_stringstream
 	if(output_column_names) {
 		if(table.columns()) { // named table
 			if(control_chars.encloser){
-				for(Array_iterator<const String*> i(*table.columns()); i.has_next(); ) {
+				for(Array_iterator<const String*> i(*table.columns()); i; ) {
 					enclose( result, i.next(), control_chars.encloser );
-					if(i.has_next())
+					if(i)
 						result<<control_chars.separator;
 				}
 			} else {
-				for(Array_iterator<const String*> i(*table.columns()); i.has_next(); ) {
+				for(Array_iterator<const String*> i(*table.columns()); i; ) {
 					result<<i.next()->cstr();
-					if(i.has_next())
+					if(i)
 						result<<control_chars.separator;
 				}
 			}
@@ -527,19 +522,19 @@ static void table_to_csv(pa_stringstream
 	// process data lines
 	Array_iterator<ArrayString*> i(table);
 	if(control_chars.encloser){
-		while(i.has_next()) {
-			for(Array_iterator<const String*> c(*i.next()); c.has_next(); ) {
+		while(i) {
+			for(Array_iterator<const String*> c(*i.next()); c; ) {
 				enclose( result, c.next(), control_chars.encloser );
-				if(c.has_next())
+				if(c)
 					result<<control_chars.separator;
 			}
 			result<<'\n';
 		}
 	} else {
-		while(i.has_next()) {
-			for(Array_iterator<const String*> c(*i.next()); c.has_next(); ) {
+		while(i) {
+			for(Array_iterator<const String*> c(*i.next()); c; ) {
 				result<<c.next()->cstr();
-				if(c.has_next())
+				if(c)
 					result<<control_chars.separator;
 			}
 			result<<'\n';
@@ -573,15 +568,15 @@ static void table_to_csv(String& result,
 	if(output_column_names) {
 		if(table.columns()) { // named table
 			if(control_chars.encloser) {
-				for(Array_iterator<const String*> i(*table.columns()); i.has_next(); ) {
+				for(Array_iterator<const String*> i(*table.columns()); i; ) {
 					enclose( result, i.next(), control_chars.encloser, control_chars.sencloser );
-					if(i.has_next())
+					if(i)
 						result<<*control_chars.sseparator;
 				}
 			} else {
-				for(Array_iterator<const String*> i(*table.columns()); i.has_next(); ) {
+				for(Array_iterator<const String*> i(*table.columns()); i; ) {
 					result<<*i.next();
-					if(i.has_next())
+					if(i)
 						result<<*control_chars.sseparator;
 				}
 			}
@@ -589,9 +584,9 @@ static void table_to_csv(String& result,
 			if(int lsize=table.count()?table[0]->count():0)
 				for(int column=0; column<lsize; column++) {
 					if(control_chars.encloser) {
-						result<<*control_chars.sencloser<<String::Body::Format(column)<<*control_chars.sencloser;
+						result<<*control_chars.sencloser<<pa_uitoa(column)<<*control_chars.sencloser;
 					} else {
-						result<<String::Body::Format(column);
+						result<<pa_uitoa(column);
 					}
 					if(column<lsize-1){
 						result<<*control_chars.sseparator;
@@ -606,19 +601,19 @@ static void table_to_csv(String& result,
 	// data lines
 	Array_iterator<ArrayString*> i(table);
 	if(control_chars.encloser){
-		while(i.has_next()) {
-			for(Array_iterator<const String*> c(*i.next()); c.has_next(); ) {
+		while(i) {
+			for(Array_iterator<const String*> c(*i.next()); c; ) {
 				enclose( result, c.next(), control_chars.encloser, control_chars.sencloser );
-				if(c.has_next())
+				if(c)
 					result<<*control_chars.sseparator;
 			}
 			result.append_know_length("\n", 1, String::L_CLEAN);
 		}
 	} else {
-		while(i.has_next()) {
-			for(Array_iterator<const String*> c(*i.next()); c.has_next(); ) {
+		while(i) {
+			for(Array_iterator<const String*> c(*i.next()); c; ) {
 				result<<*c.next();
-				if(c.has_next())
+				if(c)
 					result<<*control_chars.sseparator;
 			}
 			result.append_know_length("\n", 1, String::L_CLEAN);
@@ -644,7 +639,7 @@ static void _save(Request& r, MethodPara
 		--param_index;
 
 	const String& file_name=params.as_string(param_index++, FILE_NAME_MUST_NOT_BE_CODE);
-	String file_spec=r.absolute(file_name);
+	String file_spec=r.full_disk_path(file_name);
 
 	if(do_append && file_exist(file_spec))
 		output_column_names=false;
@@ -711,13 +706,13 @@ static void _csv_string(Request& r, Meth
 
 	table_to_csv(ost, table, control_chars, output_column_names);
 
-	r.write_no_lang(*new VString(*new String(pa_strdup(ost.str().c_str()), String::L_CLEAN)));
+	r.write(*new VString(*new String(pa_strdup(ost.str().c_str()), String::L_CLEAN)));
 #else
 	String sdata;
 
 	table_to_csv(sdata, table, control_chars, output_column_names);
 
-	r.write_no_lang(*new VString(*new String(sdata.cstr(), String::L_CLEAN)));
+	r.write(*new VString(*new String(sdata.cstr(), String::L_CLEAN)));
 #endif
 }
 
@@ -737,12 +732,12 @@ static void _count(Request& r, MethodPar
 	} else
 		result = table.count();
 
-	r.write_no_lang(*new VInt(result));
+	r.write(*new VInt(result));
 }
 
 static void _line(Request& r, MethodParams&) {
 	int result=1+GET_SELF(r, VTable).table().current();
-	r.write_no_lang(*new VInt(result));
+	r.write(*new VInt(result));
 }
 
 static void _offset(Request& r, MethodParams& params) {
@@ -756,13 +751,13 @@ static void _offset(Request& r, MethodPa
 		    else if(whence=="set")
 				absolute=true;
 		    else
-				throw Exception(PARSER_RUNTIME, &whence, "is invalid whence, valid are 'cur' or 'set'");
+				throw Exception(PARSER_RUNTIME, &whence, "is an invalid whence, valid are 'cur' or 'set'");
 		}
 		
 		int offset=params.as_int(params.count()-1, "offset must be expression", r);
 		table.offset(absolute, offset);
 	} else
-		r.write_no_lang(*new VInt(table.current()));
+		r.write(*new VInt(table.current()));
 }
 
 static void _menu(Request& r, MethodParams& params) {
@@ -773,27 +768,27 @@ static void _menu(Request& r, MethodPara
 	Value* delim_maybe_code=params.count()>1?&params[1]:0;
 
 	Table& table=GET_SELF(r, VTable).table();
-	size_t saved_current=table.current();
+	Temp_current tc(table);
 
 	if(delim_maybe_code) { // delimiter set
 		bool need_delim=false;
 		for(size_t row=0; row<table.count(); row++) {
 			table.set_current(row);
 
-			StringOrValue sv_processed=r.process(body_code);
-			Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING);
+			Value& sv_processed=r.process(body_code);
+			TempSkip4Delimiter skip(r);
 
 			const String* s_processed=sv_processed.get_string();
 			if(s_processed && !s_processed->is_empty()) { // we have body
 				if(need_delim) // need delim & iteration produced string?
-					r.write_pass_lang(r.process(*delim_maybe_code));
+					r.write(r.process(*delim_maybe_code));
 				else
 					need_delim=true;
 			}
 
-			r.write_pass_lang(sv_processed);
+			r.write(sv_processed);
 
-			if(lskip==Request::SKIP_BREAK)
+			if(skip.check_break())
 				break;
 		}
 	} else {
@@ -801,13 +796,11 @@ static void _menu(Request& r, MethodPara
 			table.set_current(row);
  
 			r.process_write(body_code);
-			Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING);
  
-			if(lskip==Request::SKIP_BREAK)
+			if(r.check_skip_break())
 				break;
 		}
 	}
-	table.set_current(saved_current);
 }
 
 #ifndef DOXYGEN
@@ -828,10 +821,10 @@ static void table_row_to_hash(Table::ele
 	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);
+		Value& sv_processed=info->r->process(*info->key_code);
 		key=&sv_processed.as_string();
 	} else {
-		key=info->key_field<row->count()?row->get(info->key_field):0;
+		key=info->key_field < row->count() ? row->get(info->key_field) : 0;
 	}
 
 	if(!key)
@@ -851,12 +844,18 @@ static void table_row_to_hash(Table::ele
 		case C_HASH: {
 			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)));
+			Table::columns_type columns=info->table->columns();
+			if(info->value_fields){ // selected fields (can be empty)
+				for(Array_iterator<int> i(*info->value_fields); i; ) {
+					size_t value_field=i.next();
+					if(value_field<row->count())
+						hash.put(columns ? *columns->get(value_field) : String(pa_uitoa(value_field)), new VString(*row->get(value_field)));
+				}
+			} else { // all fields
+				for(size_t index=0; index<row->count(); index++) {
+					hash.put(columns && index < columns->count() ? *columns->get(index) : String(pa_uitoa(index)), new VString(*row->get(index)));
+				}
 			}
-
 			exist=info->hash->put_dont_replace(*key, vhash);
 			break;
 		}
@@ -883,7 +882,7 @@ static void table_row_to_hash(Table::ele
 		case C_CODE: {
 			if(!info->key_code)
 				info->table->set_current(info->row++); // change context row
-			exist=info->hash->put_dont_replace(*key, &info->r->process(*info->value_code).as_value());
+			exist=info->hash->put_dont_replace(*key, &info->r->process(*info->value_code));
 			break;
 		}
 	}
@@ -922,102 +921,119 @@ static Table2hash_distint get_distinct(V
 static void _hash(Request& r, MethodParams& params) {
 	Table& self_table=GET_SELF(r, VTable).table();
 	VHash& result=*new VHash;
-	if(Table::columns_type columns=self_table.columns()){
-		if(columns->count()>0) {
-			Table2hash_distint distinct=D_ILLEGAL;
-			Table2hash_value_type value_type=C_HASH;
-			int param_index=params.count()-1;
-			if(param_index>0) {
-
-				if(params[1].get_junction())
-					value_type=C_CODE;
-
-				if(HashStringValue* options=params[param_index].get_hash()){ // can't use .as_hash because the 2nd param could be table so .as_hash throws an error
-					--param_index;
-					int valid_options=0;
-					if(Value* vdistinct_code=options->get(sql_distinct_name)) { // $.distinct ?
-						valid_options++;
-						distinct=get_distinct(r.process_to_value(*vdistinct_code), value_type);
-					}
-					if(Value* vvalue_type_code=options->get(sql_value_type_name)) { // $.type ?
-						if(value_type==C_TABLE) // $.distinct[tables] already was specified
-							throw Exception(PARSER_RUNTIME, 0, "you can't specify $.distinct[tables] and $.type[] together");
-						if(value_type==C_CODE)
-							throw Exception(PARSER_RUNTIME, 0, "you can't specify $.type[] if value is code");
-						valid_options++;
-						value_type=get_value_type(r.process_to_value(*vvalue_type_code));
-					}
 
-					if(valid_options!=options->count())
-						throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
-				}
+	Table2hash_distint distinct=D_ILLEGAL;
+	Table2hash_value_type value_type=C_HASH;
+
+	int param_index=params.count()-1;
+	if(param_index>0) {
+		if(params[1].get_junction())
+			value_type=C_CODE;
+
+		if(HashStringValue* options=params[param_index].get_hash()){ // can't use .as_hash because the 2nd param could be table so .as_hash throws an error
+			--param_index;
+			int valid_options=0;
+			if(Value* vdistinct_code=options->get(sql_distinct_name)) { // $.distinct ?
+				valid_options++;
+				distinct=get_distinct(r.process(*vdistinct_code), value_type);
+			}
+			if(Value* vvalue_type_code=options->get(sql_value_type_name)) { // $.type ?
+				if(value_type==C_TABLE) // $.distinct[tables] already was specified
+					throw Exception(PARSER_RUNTIME, 0, "you can't specify $.distinct[tables] and $.type[] together");
+				if(value_type==C_CODE)
+					throw Exception(PARSER_RUNTIME, 0, "you can't specify $.type[] if value is code");
+				valid_options++;
+				value_type=get_value_type(r.process(*vvalue_type_code));
 			}
 
-			if(param_index==2) // options were specified but not as hash
-				throw Exception(PARSER_RUNTIME, 0, "options must be hash");
+			if(valid_options!=options->count())
+				throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
+		}
+	}
 
-			Array<int> value_fields;
-			Value* value_code=0;
+	if(param_index==2) // options were specified but not as hash
+		throw Exception(PARSER_RUNTIME, 0, "options must be hash");
 
-			if(param_index==0){ // list of columns wasn't specified
-				if(value_type==C_STRING) // $.type[string]
-					throw Exception(PARSER_RUNTIME, 0, "you must specify one value field with option $.type[string]");
-				
-				for(size_t i=0; i<columns->count(); i++) // by all columns, including key
-					value_fields+=i;
-
-			} else { // list of columns or code was specified
-				if(value_type==C_TABLE)
-					throw Exception(PARSER_RUNTIME, 0, "you can't specify value field(s) with option $.distinct[tables] or $.type[tables]");
-
-				Value& value_fields_param=params[1];
-				if(value_fields_param.get_junction()){ // code specified
-					value_code=&value_fields_param;
-				} else if(value_fields_param.is_string()) { // one column as string was specified
-					const String &field_name=*value_fields_param.get_string();
-					if(!field_name.is_empty())
-						value_fields+=self_table.column_name2index(field_name, true);
-				} else if(Table* value_fields_table=value_fields_param.get_table()) { // list of columns were specified in table
-					for(Array_iterator<Table::element_type> i(*value_fields_table); i.has_next(); ) {
-						const String& value_field_name =*i.next()->get(0);
-						value_fields +=self_table.column_name2index(value_field_name, true);
-					}
-				} else
-					throw Exception(PARSER_RUNTIME, 0, "value field(s) must be string or table or code");
+	bool value_all=false;
+	Array<int> value_fields;
+	Value* value_code=0;
+
+	if(param_index==0){ // list of columns wasn't specified
+		if(value_type==C_STRING)
+			throw Exception(PARSER_RUNTIME, 0, "you must specify one value field with option $.type[string]");
+
+		value_all=true; // all columns, including key
+	} else { // list of columns or code was specified
+		if(value_type==C_TABLE)
+			throw Exception(PARSER_RUNTIME, 0, "you can't specify value field(s) with option $.distinct[tables] or $.type[tables]");
+
+		Value& value_fields_param=params[1];
+		if(value_fields_param.get_junction()){ // code specified
+			value_code=&value_fields_param;
+		} else if(value_fields_param.is_string()) { // one column as string was specified
+			const String &field_name=*value_fields_param.get_string();
+			if(!field_name.is_empty())
+				value_fields+=self_table.column_name2index(field_name, true);
+		} else if(Table* value_fields_table=value_fields_param.get_table()) { // list of columns were specified in table
+			for(Array_iterator<Table::element_type> i(*value_fields_table); i; ) {
+				const String& value_field_name =*i.next()->get(0);
+				value_fields +=self_table.column_name2index(value_field_name, true);
 			}
+		} else
+			throw Exception(PARSER_RUNTIME, 0, "value field(s) must be string or table or code");
+
+		if(value_type==C_STRING && value_fields.count()>1)
+			throw Exception(PARSER_RUNTIME, 0, "you can't specify more than one value field with option $.type[string]");
+	}
 
-			if(value_type==C_STRING && value_fields.count()!=1)
-				throw Exception(PARSER_RUNTIME, 0, "you can specify only one value field with option $.type[string]");
+	Value* key_param=&params[0];
+	Row_info info={
+		&r,
+		&self_table,
+		/*key_code=*/key_param->get_junction() ? key_param : 0,
+		/*key_field=*/0/*filled below*/,
+		value_all ? NULL : &value_fields,
+		value_code,
+		&result.hash(),
+		distinct,
+		/*row=*/0,
+		value_type
+	};
+	info.key_field=(info.key_code ? -1 : self_table.column_name2index(key_param->as_string(), true));
 
-			{
-				Value* key_param=&params[0];
-				Row_info info={
-					&r,
-					&self_table,
-					/*key_code=*/key_param->get_junction() ? key_param : 0,
-					/*key_field=*/0/*filled below*/,
-					&value_fields,
-					value_code,
-					&result.hash(),
-					distinct,
-					/*row=*/0,
-					value_type
-				};
-				info.key_field=(info.key_code ? -1 : self_table.column_name2index(key_param->as_string(), true));
-
-				int saved_current=self_table.current();
-				self_table.for_each(table_row_to_hash, &info);
-				self_table.set_current(saved_current);
+	self_table.for_each(table_row_to_hash, &info);
 
-				result.extract_default();
-			}
-		}
+	result.extract_default();
+
+	r.write(result);
+}
+
+static void _cells(Request& r, MethodParams& params) {
+	Table& self_table=GET_SELF(r, VTable).table();
+	size_t row_size=self_table[self_table.current()]->count(); // number of columns in current row
+
+	if(params.count()){
+		int limit=params.as_int(params.count()-1, "offset must be expression", r);
+		if(limit<0)
+			limit=0;
+		if((size_t)limit<row_size)
+			row_size=limit;
+	}
+
+	VArray& result=*new VArray(row_size);
+	ArrayValue& result_array=result.array();
+
+	for(size_t index=0; index<row_size; index++){
+		const String* column_item=self_table.item(index);
+		result_array+=column_item ? new VString(*column_item) : VString::empty();
 	}
-	r.write_no_lang(result);
+
+	result_array.confirm_all_used();
+	r.write(result);
 }
 
 #ifndef DOXYGEN
-struct Table_seq_item {
+struct Table_seq_item : public PA_Allocated {
 	ArrayString* row;
 	union {
 		const char *c_str;
@@ -1044,14 +1060,12 @@ static int sort_cmp_double(const void *a
 static void _sort(Request& r, MethodParams& params) {
 	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()=="desc":
-		false; // default=asc
+	bool reverse=params.count()>1 /*..[desc|asc|]*/ && params.as_no_junction(1, "order must not be code").as_string()=="desc"; // default=asc
 
 	Table& old_table=GET_SELF(r, VTable).table();
 	Table& new_table=*new Table(old_table.columns());
 
-	Table_seq_item* seq=new(PointerFreeGC) Table_seq_item[old_table.count()];
+	Table_seq_item* seq=new Table_seq_item[old_table.count()];
 	int i;
 
 	// calculate key values
@@ -1061,7 +1075,7 @@ static void _sort(Request& r, MethodPara
 		old_table.set_current(i);
 		// calculate key value
 		seq[i].row=old_table[i];
-		Value& value=r.process_to_value(key_maker);
+		Value& value=r.process(key_maker);
 		if(i==0) // determining key values type by first one
 			key_values_are_strings=value.is_string();
 
@@ -1075,7 +1089,7 @@ static void _sort(Request& r, MethodPara
 	if(r.charsets.source().NAME()=="KOI8-R" && key_values_are_strings) {
 		for(i=0; i<old_count; i++)
 			if(*seq[i].value.c_str)
-				seq[i].value.c_str=Charset::transcode(seq[i].value.c_str, r.charsets.source(), UTF8_charset).cstr();
+				seq[i].value.c_str=Charset::transcode(seq[i].value.c_str, r.charsets.source(), pa_UTF8_charset).cstr();
 	}
 
 	// sort keys
@@ -1099,7 +1113,7 @@ struct Expression_is_true_info {
 #endif
 
 static bool expression_is_true(Table&, Expression_is_true_info* info) {
-	return info->r->process_to_value(*info->expression_code).as_bool();
+	return info->r->process(*info->expression_code).as_bool();
 }
 
 static bool _locate_expression(Table& table, Request& r, MethodParams& params) {
@@ -1124,7 +1138,7 @@ static void _locate(Request& r, MethodPa
 	bool result=params[0].get_junction() || (params.count() == 1) ?
 		_locate_expression(table, r, params) :
 		_locate_name_value(table, r, params);
-	r.write_no_lang(VBool::get(result));
+	r.write(VBool::get(result));
 }
 
 
@@ -1142,7 +1156,7 @@ static void _flip(Request& r, MethodPara
 				new_table+=new_row;
 			}
 
-	r.write_no_lang(*new VTable(&new_table));
+	r.write(*new VTable(&new_table));
 }
 
 static void _foreach(Request& r, MethodParams& params) {
@@ -1156,7 +1170,7 @@ static void _foreach(Request& r, MethodP
 	Value* delim_maybe_code=params.count()>3?&params[3]:0;
 
 	Table& table=GET_SELF(r, VTable).table();
-	size_t saved_current=table.current();
+	Temp_current tc(table);
 
 	rownum_var_name=rownum_var_name->is_empty()? 0 : rownum_var_name;
 	value_var_name=value_var_name->is_empty()? 0 : value_var_name;
@@ -1169,24 +1183,24 @@ static void _foreach(Request& r, MethodP
 			table.set_current(row);
 
 			if(rownum_var_name)
-				r.put_element(*var_context, *rownum_var_name, new VString(*new String(String::Body::Format(row), String::L_CLEAN)));
+				r.put_element(*var_context, *rownum_var_name, new VString(*new String(pa_uitoa(row), String::L_CLEAN)));
 			if(value_var_name)
 				r.put_element(*var_context, *value_var_name, new VTable(&table));
 
-			StringOrValue sv_processed=r.process(body_code);
-			Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING);
+			Value& sv_processed=r.process(body_code);
+			TempSkip4Delimiter skip(r);
 
 			const String* s_processed=sv_processed.get_string();
 			if(s_processed && !s_processed->is_empty()) { // we have body
 				if(need_delim) // need delim & iteration produced string?
-					r.write_pass_lang(r.process(*delim_maybe_code));
+					r.write(r.process(*delim_maybe_code));
 				else
 					need_delim=true;
 			}
 
-			r.write_pass_lang(sv_processed);
+			r.write(sv_processed);
 
-			if(lskip==Request::SKIP_BREAK)
+			if(skip.check_break())
 				break;
 		}
 	} else {
@@ -1194,18 +1208,16 @@ static void _foreach(Request& r, MethodP
 			table.set_current(row);
  
 			if(rownum_var_name)
-				r.put_element(*var_context, *rownum_var_name, new VString(*new String(String::Body::Format(row), String::L_CLEAN)));
+				r.put_element(*var_context, *rownum_var_name, new VString(*new String(pa_uitoa(row), String::L_CLEAN)));
 			if(value_var_name)
 				r.put_element(*var_context, *value_var_name, new VTable(&table));
 
 			r.process_write(body_code);
-			Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING);
  
-			if(lskip==Request::SKIP_BREAK)
+			if(r.check_skip_break())
 				break;
 		}
 	}
-	table.set_current(saved_current);
 }
 
 static void update_cell(HashStringValue::key_type aname, HashStringValue::value_type avalue, VTable *dest) {
@@ -1216,7 +1228,6 @@ inline Table::element_type row_from_stri
 	if(!param.is_string() && !param.get_junction())
 		throw Exception(PARSER_RUNTIME, 0, "row must be string, code or hash");
 
-	Temp_lang temp_lang(r, String::L_PASS_APPENDED);
 	const String& string=r.process_to_string(param);
 
 	// parse cells
@@ -1232,11 +1243,10 @@ static void _append(Request& r, MethodPa
 
 	HashStringValue* hash=params[0].get_hash();
 	if(hash){
+		Temp_current tc(table);
 		table+=new ArrayString();
-		size_t saved_current=table.current();
 		table.set_current(table.count()-1);
 		hash->for_each<VTable*>(update_cell, &vtable);
-		table.set_current(saved_current);
 	} else {
 		table+=row_from_string(r, params[0]);
 	}
@@ -1273,18 +1283,18 @@ static void join_nameless_row(Table& src
 	*dest+=src[src.current()];
 }
 static void _join(Request& r, MethodParams& params) {
-	Table& src=*params.as_table(0, "source");
+	if(Table* src=params.as_table(0, "source")){
+		Table::Action_options o=get_action_options(r, params, 1, *src);
 
-	Table::Action_options o=get_action_options(r, params, 1, src);
-
-	Table& dest=GET_SELF(r, VTable).table();
-	if(&src == &dest)
-		throw Exception(PARSER_RUNTIME, 0, "source and destination are same table");
-
-	if(dest.columns()) // dest is named
-		src.table_for_each(join_named_row, &dest, o);
-	else // dest is nameless
-		src.table_for_each(join_nameless_row, &dest, o);
+		Table& dest=GET_SELF(r, VTable).table();
+		if(src == &dest)
+			throw Exception(PARSER_RUNTIME, 0, "source and destination are same table");
+
+		if(dest.columns()) // dest is named
+			src->table_for_each(join_named_row, &dest, o);
+		else // dest is nameless
+			src->table_for_each(join_nameless_row, &dest, o);
+	}
 }
 
 #ifndef DOXYGEN
@@ -1304,17 +1314,21 @@ public:
 			columns+=new String(str, String::L_TAINTED /* no length as 0x00 can be inside */);
 			return false;
 		} catch(...) {
-			error=SQL_Error("exception occured in Table_sql_event_handlers::add_column");
+			error=SQL_Error("exception occurred in Table_sql_event_handlers::add_column");
 			return true;
 		}
 	}
-	bool before_rows(SQL_Error& error) { 
+	bool before_rows(SQL_Error& error) {
+		if(table) {
+			error=SQL_Error("result must contain exactly one table");
+			return true;
+		}
 		try {
 			table=new Table(&columns);
 			columns_count=columns.count();
 			return false;
 		} catch(...) {
-			error=SQL_Error("exception occured in Table_sql_event_handlers::before_rows");
+			error=SQL_Error("exception occurred in Table_sql_event_handlers::before_rows");
 			return true;
 		}
 	}
@@ -1323,7 +1337,7 @@ public:
 			*table+=row=new ArrayString(columns_count);
 			return false;
 		} catch(...) {
-			error=SQL_Error("exception occured in Table_sql_event_handlers::add_row");
+			error=SQL_Error("exception occurred in Table_sql_event_handlers::add_row");
 			return true;
 		}
 	}
@@ -1332,18 +1346,14 @@ public:
 			*row+=str?new String(str, String::L_TAINTED /* no length as 0x00 can be inside */):&String::Empty;
 			return false;
 		} catch(...) {
-			error=SQL_Error("exception occured in Table_sql_event_handlers::add_row_cell");
+			error=SQL_Error("exception occurred in Table_sql_event_handlers::add_row_cell");
 			return true;
 		}
 	}
 };
 #endif
 
-static void marshal_bind(
-						 HashStringValue::key_type aname, 
-						 HashStringValue::value_type avalue,
-						 SQL_Driver::Placeholder** pptr) 
-{
+static void marshal_bind( HashStringValue::key_type aname, HashStringValue::value_type avalue, SQL_Driver::Placeholder** pptr) {
 	SQL_Driver::Placeholder& ph=**pptr;
 	ph.name=aname.cstr();
 	ph.value=avalue->as_string().untaint_cstr(String::L_AS_IS);
@@ -1356,7 +1366,7 @@ static void marshal_bind(
 // not static, used elsewhere
 int marshal_binds(HashStringValue& hash, SQL_Driver::Placeholder*& placeholders) {
 	int hash_count=hash.count();
-	placeholders=new SQL_Driver::Placeholder[hash_count];
+	placeholders=new(PointerGC) SQL_Driver::Placeholder[hash_count];
 	SQL_Driver::Placeholder* ptr=placeholders;
 	hash.for_each<SQL_Driver::Placeholder**>(marshal_bind, &ptr);
 	return hash_count;
@@ -1391,11 +1401,11 @@ static void _sql(Request& r, MethodParam
 			}
 			if(Value* vlimit=options->get(sql_limit_name)) {
 				valid_options++;
-				limit=(ulong)r.process_to_value(*vlimit).as_double();
+				limit=(ulong)r.process(*vlimit).as_double();
 			}
 			if(Value* voffset=options->get(sql_offset_name)) {
 				valid_options++;
-				offset=(ulong)r.process_to_value(*voffset).as_double();
+				offset=(ulong)r.process(*voffset).as_double();
 			}
 			if(valid_options!=options->count())
 				throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
@@ -1406,9 +1416,8 @@ static void _sql(Request& r, MethodParam
 	if(bind)
 		placeholders_count=marshal_binds(*bind, placeholders);
 
-	Temp_lang temp_lang(r, String::L_SQL);
 	const String&  statement_string=r.process_to_string(statement);
-	const char* statement_cstr=statement_string.untaint_cstr(r.flang, r.connection());
+	const char* statement_cstr=statement_string.untaint_cstr(String::L_SQL, r.connection());
 
 	Table_sql_event_handlers handlers;
 
@@ -1443,17 +1452,18 @@ static void _columns(Request& r, MethodP
 
 	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(); ) {
+		for(Array_iterator<const String*> i(*source_columns); i; ) {
 			Table::element_type result_row(new ArrayString);
 			*result_row+=i.next();
 			result_table+=result_row;
 		}
 	}
 
-	r.write_no_lang(*new VTable(&result_table));
+	r.write(*new VTable(&result_table));
 }
 
 static void _select(Request& r, MethodParams& params) {
+	InCycle temp(r);
 	Value& vcondition=params.as_expression(0, "condition must be number, bool or expression");
 
 	Table& source_table=GET_SELF(r, VTable).table();
@@ -1467,15 +1477,15 @@ static void _select(Request& r, MethodPa
 			int valid_options=0;
 			if(Value* vlimit=options->get(sql_limit_name)) {
 				valid_options++;
-				limit=r.process_to_value(*vlimit).as_int();
+				limit=r.process(*vlimit).as_int();
 			}
 			if(Value* voffset=options->get(sql_offset_name)) {
 				valid_options++;
-				offset=r.process_to_value(*voffset).as_int();
+				offset=r.process(*voffset).as_int();
 			}
 			if(Value* vreverse=options->get(table_reverse_name)) {
 				valid_options++;
-				reverse=r.process_to_value(*vreverse).as_bool();
+				reverse=r.process(*vreverse).as_bool();
 			}
 			if(valid_options!=options->count())
 				throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
@@ -1487,14 +1497,17 @@ static void _select(Request& r, MethodPa
 	if(offset<0)
 		offset+=size;
 	if(size && limit>0 && offset>=0 && (size_t)offset<size){
-		size_t saved_current=source_table.current();
+		Temp_current tcurrent(source_table);
 		size_t appended=0;
 
 		if(reverse){
 			for(size_t row=size-1; result_table.count() < (size_t)limit; row--) {
 				source_table.set_current(row);
 
-				bool condition=r.process_to_value(vcondition, false/*don't intercept string*/).as_bool();
+				bool condition=r.process(vcondition).as_bool();
+
+				if(r.check_skip_break())
+					break;
 
 				if(condition && ++appended > (size_t)offset) // ...condition is true, adding to the result
 					result_table+=source_table[row];
@@ -1504,16 +1517,54 @@ static void _select(Request& r, MethodPa
 			for(size_t row=0; row < size && result_table.count() < (size_t)limit; row++) {
 				source_table.set_current(row);
 
-				bool condition=r.process_to_value(vcondition, false/*don't intercept string*/).as_bool();
+				bool condition=r.process(vcondition).as_bool();
+
+				if(r.check_skip_break())
+					break;
 
 				if(condition && ++appended > (size_t)offset) // ...condition is true, adding to the result
 					result_table+=source_table[row];
 			}
 		}
-		source_table.set_current(saved_current);
 	}
 
-	r.write_no_lang(*new VTable(&result_table));
+	r.write(*new VTable(&result_table));
+}
+
+
+static void _rename(Request& r, MethodParams& params) {
+	const String* name_from=NULL;
+	const String* name_to=NULL;
+	HashStringValue* names=NULL;
+
+	if(params.count()>1){
+		name_from=&params.as_string(0, COLUMN_NAME_MUST_BE_STRING);
+		name_to=&params.as_string(1, COLUMN_NAME_MUST_BE_STRING);
+	} else
+		names=params.as_hash(0);
+
+	Table& table=GET_SELF(r, VTable).table();
+	if(Table::columns_type columns=table.columns()) {
+		if(names){
+			for(size_t i=0; i<columns->count(); i++) {
+				const String *column = columns->get(i);
+				if(Value* vto=names->get(*column)){
+					if(const String *sto=vto->get_string())
+						columns->put(i, sto);
+					else
+						throw Exception(PARSER_RUNTIME, column, COLUMN_NAME_MUST_BE_STRING);
+				}
+			}
+		} else if(name_from){
+			for(size_t i=0; i<columns->count(); i++) {
+				const String *column = columns->get(i);
+				if(*column == *name_from)
+					columns->put(i, name_to);
+			}
+		}
+		table.column_names_init();
+	} else
+		throw Exception(PARSER_RUNTIME, 0, "columns renaming is not supported for nameless tables");
 }
 
 // constructor
@@ -1563,6 +1614,10 @@ MTable::MTable(): Methoded("table") {
 	// ^table.hash[key field name][value field name(s) string/table]
 	add_native_method("hash", Method::CT_DYNAMIC, _hash, 1, 3);
 
+	// ^table.cells[]
+	// ^table.cells(limit)
+	add_native_method("cells", Method::CT_DYNAMIC, _cells, 0, 1);
+
 	// ^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);
@@ -1599,4 +1654,8 @@ MTable::MTable(): Methoded("table") {
 
 	// ^table.select(expression) = table
 	add_native_method("select", Method::CT_DYNAMIC, _select, 1, 2);
+
+	// ^table.rename[column name from;column name to] 
+	// ^table.rename[ $.[column name from][column name to] ... ]
+	add_native_method("rename", Method::CT_DYNAMIC, _rename, 1, 2);
 }