--- parser3/src/classes/hash.C	2008/05/14 10:19:04	1.83
+++ parser3/src/classes/hash.C	2009/05/05 10:06:57	1.91
@@ -1,11 +1,11 @@
 /** @file
 	Parser: @b hash parser class.
 
-	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_HASH_C="$Date: 2008/05/14 10:19:04 $";
+static const char * const IDENT_HASH_C="$Date: 2009/05/05 10:06:57 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -45,23 +45,35 @@ class Hash_sql_event_handlers: public SQ
 	const String& statement_string; const char* statement_cstr;
 	bool distinct;
 	HashStringValue& rows_hash;
-	HashStringValue* row_hash;
+	Value* row_value;
 	int column_index;
-	ArrayString columns;
-	bool only_one_column;
+	ArrayString& columns;
+	bool one_bool_column;
 	static VBool only_one_column_value;
+	Table2hash_value_type value_type;
+	int columns_count;
+public:
+	Table* empty;
 public:
 	Hash_sql_event_handlers(
-		const String& astatement_string, const char* astatement_cstr,
+		const String& astatement_string,
+		const char* astatement_cstr,
 		bool adistinct,
-		HashStringValue& arows_hash): 
-		statement_string(astatement_string), statement_cstr(astatement_cstr),
+		HashStringValue& arows_hash,
+		Table2hash_value_type avalue_type)
+	: 
+		statement_string(astatement_string),
+		statement_cstr(astatement_cstr),
 		distinct(adistinct),
 		rows_hash(arows_hash),
-		row_hash(0),
+		value_type(avalue_type),
+		row_value(0),
 		column_index(0),
-		only_one_column(false) {
+		one_bool_column(false),
+		columns(*new ArrayString),
+		empty(0) {
 	}
+
 	bool add_column(SQL_Error& error, const char* str, size_t length) {
 		try {
 			columns+=new String(str, length, true);
@@ -71,33 +83,101 @@ public:
 			return true;
 		}
 	}
+
 	bool before_rows(SQL_Error& error) { 
 		if(columns.count()<1) {
 			error=SQL_Error(PARSER_RUNTIME, "no columns");
 			return true;
 		}
-		only_one_column=columns.count()==1;
-
+		switch(value_type){
+			case C_STRING: {
+				if(columns.count()>2){
+					error=SQL_Error(PARSER_RUNTIME, "only 2 columns allowed for $.type[string].");
+					return true;
+				}
+			}
+			case C_TABLE: {
+				// create empty table which we'll copy later
+				empty=new Table(&columns);
+				columns_count=columns.count();
+			}
+			case C_HASH: {
+				one_bool_column=columns.count()==1;
+			}
+		}
 		return false;
 	}
+
 	bool add_row(SQL_Error& /*error*/) {
 		column_index=0;
 		return false;
 	}
+
 	bool add_row_cell(SQL_Error& error, const char *ptr, size_t length) {
 		try {
 			String& cell=*new String;
 			if(length)
 				cell.append_know_length(ptr, length, String::L_TAINTED);
+
 			bool duplicate=false;
-			if(only_one_column) {
+			if(one_bool_column) {
 				duplicate=rows_hash.put_dont_replace(cell, &only_one_column_value);  // put. existed?
 			} else if(column_index==0) {
-				VHash* row_vhash=new VHash;
-				row_hash=&row_vhash->hash();
-				duplicate=rows_hash.put_dont_replace(cell, row_vhash); // put. existed?
-			} else
-				row_hash->put(*columns[column_index], new VString(cell));
+				switch(value_type){
+					case C_HASH: {
+						VHash* row_vhash=new VHash;
+						row_value=row_vhash;
+						duplicate=rows_hash.put_dont_replace(cell, row_vhash); // put. existed?
+						break;
+					}
+					case C_STRING: {
+						VString* row_vstring=new VString();
+						row_value=row_vstring;
+						duplicate=rows_hash.put_dont_replace(cell, row_vstring);  // put. existed?
+						break;
+					}
+					case C_TABLE: {
+						VTable* vtable=(VTable*)rows_hash.get(cell);
+						Table* table;
+
+						if(vtable) { // table with this key exist?
+							if(!distinct) {
+								duplicate=true;
+								break;
+							}
+							table=vtable->get_table();
+						} else {
+							// no? creating table of same structure as source
+							Table::Action_options table_options(0, 0);
+							table=new Table(*empty, table_options/*no rows, just structure*/);
+							vtable=new VTable(table);
+							rows_hash.put(cell, vtable); // put
+						}
+						ArrayString* row=new ArrayString(columns_count);
+						row_value=(Value*)row;
+						*row+=&cell;
+						*table+=row;
+						break;
+					}
+				}
+			} else {
+				switch(value_type) {
+					case C_HASH: {
+						row_value->get_hash()->put(*columns[column_index], new VString(cell));
+						break;
+					}
+					case C_STRING: {
+						VString* row_string=(VString*)row_value;
+						row_string->set_string(cell);
+						break;
+					}
+					case C_TABLE: {
+						ArrayString* row=(ArrayString*)row_value;
+						*row+=&cell;
+						break;
+					}
+				}
+			}
 
 			if(duplicate & !distinct) {
 				error=SQL_Error(PARSER_RUNTIME, "duplicate key");
@@ -212,7 +292,7 @@ static void _intersects(Request& r, Meth
 		result=GET_SELF(r, VHash).hash().first_that<HashStringValue*>(intersects, b)!=0;
 
 	// return result
-	r.write_no_lang(*new VBool(result));
+	r.write_no_lang(VBool::get(result));
 }
 
 
@@ -230,7 +310,7 @@ static void _sql(Request& r, MethodParam
 	Value& statement=params.as_junction(0, "statement must be code");
 
 	HashStringValue* bind=0;
-	ulong limit=0;
+	ulong limit=SQL_NO_LIMIT;
 	ulong offset=0;
 	bool distinct=false;
 	Table2hash_value_type value_type=C_HASH;
@@ -283,7 +363,9 @@ static void _sql(Request& r, MethodParam
 	Hash_sql_event_handlers handlers(
 		statement_string, statement_cstr, 
 		distinct,
-		hash);
+		hash,
+		value_type);
+
 	r.connection()->query(
 		statement_cstr, 
 		placeholders_count, placeholders,
@@ -329,9 +411,8 @@ static void _delete(Request& r, MethodPa
 }
 
 static void _contains(Request& r, MethodParams& params) {
-
-	bool result = GET_SELF(r, VHash).hash().contains(params.as_string(0, "key must be string"));
-	r.write_no_lang(*new VBool(result));
+	bool result=GET_SELF(r, VHash).hash().contains(params.as_string(0, "key must be string"));
+	r.write_no_lang(VBool::get(result));
 }
 
 #ifndef DOXYGEN
@@ -342,44 +423,56 @@ struct Foreach_info {
 	Value* body_code;
 	Value* delim_maybe_code;
 
+	Value* var_context;
 	VString* vkey;
 	bool need_delim;
 };
 #endif
-static bool one_foreach_cycle(						   
-			      HashStringValue::key_type akey, 
-			      HashStringValue::value_type avalue, 
-			      Foreach_info *info) {
-	info->vkey->set_string(*new String(akey, String::L_TAINTED));
-	Value& ncontext=*info->r->get_method_frame()->caller();
-	ncontext.put_element(ncontext, *info->key_var_name, info->vkey, false);
-	ncontext.put_element(ncontext, *info->value_var_name, avalue, false);
-
-	StringOrValue sv_processed=info->r->process(*info->body_code);
-	Request::Skip lskip=info->r->get_skip(); info->r->set_skip(Request::SKIP_NOTHING);
-
-	const String* s_processed=sv_processed.get_string();
-	if(info->delim_maybe_code && s_processed && s_processed->length()) { // delimiter set and we have body
-		if(info->need_delim) // need delim & iteration produced string?
-			info->r->write_pass_lang(info->r->process(*info->delim_maybe_code));
-		else
-			info->need_delim=true;
+static bool one_foreach_cycle(
+				HashStringValue::key_type akey, 
+				HashStringValue::value_type avalue, 
+				Foreach_info *info) {
+	Value& var_context=*info->var_context;
+	if(info->key_var_name){
+		info->vkey->set_string(*new String(akey, String::L_TAINTED));
+		var_context.put_element(var_context, *info->key_var_name, info->vkey, false);
 	}
+	if(info->value_var_name)
+		var_context.put_element(var_context, *info->value_var_name, avalue, false);
 
-	info->r->write_pass_lang(sv_processed);
-
-	return lskip==Request::SKIP_BREAK;
+	if(info->delim_maybe_code){ // delimiter set
+		StringOrValue sv_processed=info->r->process(*info->body_code);
+		Request::Skip lskip=info->r->get_skip(); info->r->set_skip(Request::SKIP_NOTHING);
+
+		const String* s_processed=sv_processed.get_string();
+		if(s_processed && !s_processed->is_empty()) { // we have body
+			if(info->need_delim) // need delim & iteration produced string?
+				info->r->write_pass_lang(info->r->process(*info->delim_maybe_code));
+			else
+				info->need_delim=true;
+		}
+		info->r->write_pass_lang(sv_processed);
+		return lskip==Request::SKIP_BREAK;
+	} else {
+		info->r->process_write(*info->body_code);
+		Request::Skip lskip=info->r->get_skip(); info->r->set_skip(Request::SKIP_NOTHING);
+		return lskip==Request::SKIP_BREAK;
+	}
 }
 static void _foreach(Request& r, MethodParams& params) {
 	Temp_hash_value<const String::Body, void*> 
 		cycle_data_setter(r.classes_conf, cycle_data_name, /*any not null flag*/&r);
 
+	const String& key_var_name=params.as_string(0, "key-var name must be string");
+	const String& value_var_name=params.as_string(1, "value-var name must be string");
+
 	Foreach_info info={
 		&r,
-		&params.as_string(0, "key-var name must be string"),
-		&params.as_string(1, "value-var name must be string"),
+		key_var_name.is_empty()? 0 : &key_var_name,
+		value_var_name.is_empty()? 0 : &value_var_name,
 		&params.as_junction(2, "body must be code"),
-		params.count()>3?params.get(3):0,
+		/*delimiter*/params.count()>3?params.get(3):0,
+		/*var_context*/r.get_method_frame()->caller(),
 		/*vkey=*/new VString,
 		false
 	};