--- parser3/src/classes/hash.C	2002/02/08 08:30:10	1.35
+++ parser3/src/classes/hash.C	2009/07/06 12:13:29	1.98
@@ -1,13 +1,15 @@
 /** @file
 	Parser: @b hash parser class.
 
-	Copyright (c) 2001, 2002 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)
-
-	$Id: hash.C,v 1.35 2002/02/08 08:30:10 paf Exp $
 */
 
+static const char * const IDENT_HASH_C="$Date: 2009/07/06 12:13:29 $";
+
 #include "classes.h"
+#include "pa_vmethod_frame.h"
+
 #include "pa_request.h"
 #include "pa_vhash.h"
 #include "pa_vvoid.h"
@@ -16,253 +18,399 @@
 #include "pa_vbool.h"
 #include "pa_vmethod_frame.h"
 
-// defines
-
-#define HASH_CLASS_NAME "hash"
-
 // class
 
-class MHash : public Methoded {
+class MHash: public Methoded {
 public: // VStateless_class
-	Value *create_new_value(Pool& pool) { return new(pool) VHash(pool); }
+	Value* create_new_value(Pool&, HashStringValue*) { return new VHash(); }
 
 public:
-	MHash(Pool& pool);
+	MHash();
 public: // Methoded
 	bool used_directly() { return true; }
 };
 
+// global variable
+
+DECLARE_CLASS_VAR(hash, new MHash, 0);
+
+// externs
+
+extern String cycle_data_name;
+
 // methods
 
 #ifndef DOXYGEN
-class Hash_sql_event_handlers : public SQL_Driver_query_event_handlers {
+class Hash_sql_event_handlers: public SQL_Driver_query_event_handlers {
+	const String& statement_string; const char* statement_cstr;
+	bool distinct;
+	HashStringValue& rows_hash;
+	Value* row_value;
+	int column_index;
+	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(Pool& apool, const String& amethod_name,
-		const String& astatement_string, const char *astatement_cstr,
-		Hash& arows_hash) :
-		pool(apool), 
-		method_name(amethod_name),
+	Hash_sql_event_handlers(
+		const String& astatement_string,
+		const char* astatement_cstr,
+		bool adistinct,
+		HashStringValue& arows_hash,
+		Table2hash_value_type avalue_type)
+	: 
 		statement_string(astatement_string),
 		statement_cstr(astatement_cstr),
+		distinct(adistinct),
 		rows_hash(arows_hash),
-		columns(pool),
-		row_index(0) {
+		value_type(avalue_type),
+		row_value(0),
+		column_index(0),
+		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, String::L_TAINTED, length);
+			return false;
+		} catch(...) {
+			error=SQL_Error("exception occured in Hash_sql_event_handlers::add_column");
+			return true;
+		}
 	}
-	void add_column(void *ptr, size_t size) {
-		String *column=new(pool) String(pool);
-		column->APPEND_TAINTED(
-			(const char *)ptr, size, 
-			statement_cstr, 0);
-		columns+=column;
-	}
-	void before_rows() { 
-		if(columns.size()<=1)
-			throw Exception(0, 0,
-				&method_name,
-				"column count must be more than 1 to create a hash");
+
+	bool before_rows(SQL_Error& error) { 
+		if(columns.count()<1) {
+			error=SQL_Error(PARSER_RUNTIME, "no columns");
+			return true;
+		}
+		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;
 	}
-	void add_row() {
+
+	bool add_row(SQL_Error& /*error*/) {
 		column_index=0;
+		return false;
 	}
-	void add_row_cell(void *ptr, size_t size) {
-		String *cell=new(pool) String(pool);
-		if(size)
-			cell->APPEND_TAINTED(
-				(const char *)ptr, size, 
-				statement_cstr, row_index++);
-		if(column_index==0) {
-			VHash *row_vhash=new(pool) VHash(pool);
-			row_hash=row_vhash->get_hash(0);
-			rows_hash.put(*cell, row_vhash);
-		} else
-			row_hash->put(*columns.get_string(column_index), new(pool) VString(*cell));
-		column_index++;
-	}
-
-private:
-	Pool& pool;
-	const String& method_name;
-	const String& statement_string; const char *statement_cstr;
-	Hash& rows_hash;
-	Hash *row_hash;
-	int column_index;
-	Array columns;
-	int row_index;
+
+	bool add_row_cell(SQL_Error& error, const char *ptr, size_t length) {
+		try {
+			String& cell=*new String(ptr, String::L_TAINTED, length);
+
+			bool duplicate=false;
+			if(one_bool_column) {
+				duplicate=rows_hash.put_dont_replace(cell, &only_one_column_value);  // put. existed?
+			} else if(column_index==0) {
+				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");
+				return true;
+			}
+
+			column_index++;
+			return false;
+		} catch(...) {
+			error=SQL_Error("exception occured in Hash_sql_event_handlers::add_row_cell");
+			return true;
+		}
+	}
+
 };
+VBool Hash_sql_event_handlers::only_one_column_value(true);
+
 #endif
 
-static void copy_all_overwrite_to(const Hash::Key& key, Hash::Val *value, void *info) {
-	Hash& dest=*static_cast<Hash *>(info);
-	dest.put(key, value);
-}
-static void _create_or_add(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
-	
-	if(params->size()) {
-		Value& vb=params->as_no_junction(0, "param must be hash");
-		if(Hash *b=vb.get_hash(&method_name))
-			b->for_each(copy_all_overwrite_to, &static_cast<VHash *>(r.self)->hash(&method_name));
+static void _create_or_add(Request& r, MethodParams& params) {
+	if(params.count()) {
+		Value& vsrc=params.as_no_junction(0, "param must be hash");
+		if(HashStringValue* src=vsrc.get_hash()) {
+			VHash& self=GET_SELF(r, VHash);
+			HashStringValue* self_hash=&(self.hash());
+			if(src==self_hash) // same: doing nothing
+				return;
+			src->for_each<HashStringValue*>(copy_all_overwrite_to, self_hash);
+
+			if(VHash* vhash_src=static_cast<VHash*>(vsrc.as(VHASH_TYPE, false)))
+			{
+				if(Value* vdefault=vhash_src->get_default())
+				{
+					if(vdefault->is_defined())
+					{
+						self.set_default(vdefault);
+					}
+				}
+			}
+		}
 	}
 }
 
-static void remove_key_from(const Hash::Key& key, Hash::Val *value, void *info) {
-	Hash& dest=*static_cast<Hash *>(info);
-	dest.remove(key);
-}
-static void _sub(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
-	
-	Value& vb=params->as_no_junction(0, "param must be hash");
-	if(Hash *b=vb.get_hash(&method_name))
-		b->for_each(remove_key_from, &static_cast<VHash *>(r.self)->hash(&method_name));
-}
-
-static void copy_all_dontoverwrite_to(const Hash::Key& key, Hash::Val *value, void *info) {
-	Hash& dest=*static_cast<Hash *>(info);
-	dest.put_dont_replace(key, value);
+static void _sub(Request& r, MethodParams& params) {
+	Value& vsrc=params.as_no_junction(0, "param must be hash");
+	if(HashStringValue* src=vsrc.get_hash()) {
+		HashStringValue* self=&(GET_SELF(r, VHash).hash());
+		if(src==self) { // same: clearing
+			self->clear();
+			return;
+		}
+		src->for_each<HashStringValue*>(remove_key_from, self);
+	}
 }
-static void _union(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
 
+static void copy_all_dontoverwrite_to(
+								  HashStringValue::key_type key, 
+								  HashStringValue::value_type value, 
+								  HashStringValue* dest) {
+	dest->put_dont_replace(key, value);
+}
+static void _union(Request& r, MethodParams& params) {
 	// dest = copy of self
-	Hash& dest=*new(pool) Hash(static_cast<VHash *>(r.self)->hash(&method_name));
+	Value& result=*new VHash(GET_SELF(r, VHash).hash());
 	// dest += b
-	Value& vb=params->as_no_junction(0, "param must be hash");
-	if(Hash *b=vb.get_hash(&method_name))
-		b->for_each(copy_all_dontoverwrite_to, &dest);
+	Value& vsrc=params.as_no_junction(0, "param must be hash");
+	if(HashStringValue* src=vsrc.get_hash())
+		src->for_each<HashStringValue*>(copy_all_dontoverwrite_to, result.get_hash());
 
 	// return result
-	Value& result=*new(pool) VHash(pool, dest);
-	result.set_name(method_name);
 	r.write_no_lang(result);
 }
 
 #ifndef DOXYGEN
 struct Copy_intersection_to_info {
-	Hash *b;
-	Hash *dest;
+	HashStringValue* b;
+	HashStringValue* dest;
 };
 #endif
-
-static void copy_intersection_to(const Hash::Key& key, Hash::Val *value, void *info) {
-	Copy_intersection_to_info& i=*static_cast<Copy_intersection_to_info *>(info);
-
-	if(i.b->get(key))
-		i.dest->put_dont_replace(key, value);
+static void copy_intersection_to(
+								 HashStringValue::key_type key, 
+								 HashStringValue::value_type value, 
+								 Copy_intersection_to_info *info) {
+	if(info->b->get(key))
+		info->dest->put_dont_replace(key, value);
 }
-static void _intersection(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
-
-	// dest = copy of self
-	Hash& dest=*new(pool) Hash(pool);
+static void _intersection(Request& r, MethodParams& params) {
+	Value& result=*new VHash;
 	// dest += b
-	Value& vb=params->as_no_junction(0, "param must be hash");
-	if(Hash *b=vb.get_hash(&method_name)) {
-		Copy_intersection_to_info info={
-			b,
-			&dest
-		};
-		static_cast<VHash *>(r.self)->hash(&method_name).for_each(copy_intersection_to, &info);
+	Value& vb=params.as_no_junction(0, "param must be hash");
+	if(HashStringValue* b=vb.get_hash()) {
+		Copy_intersection_to_info info={b, result.get_hash()};
+		GET_SELF(r, VHash).hash().for_each<Copy_intersection_to_info*>(copy_intersection_to, &info);
 	}
 
 	// return result
-	Value& result=*new(pool) VHash(pool, dest);
-	result.set_name(method_name);
 	r.write_no_lang(result);
 }
 
-static void *intersects(const Hash::Key& key, Hash::Val *value, void *info) {
-	return static_cast<Hash *>(info)->get(key);
+static bool intersects(
+					   HashStringValue::key_type key, 
+					   HashStringValue::value_type /*value*/, 
+					   HashStringValue* b) {
+	return b->get(key)!=0;
 }
 
-static void _intersects(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
-
-	bool yes=false;
-
-	// dest = copy of self
-	Hash& dest=*new(pool) Hash(pool);
-	// dest += b
-	Value& vb=params->as_no_junction(0, "param must be hash");
-	if(Hash *b=vb.get_hash(&method_name))
-		yes=static_cast<VHash *>(r.self)->hash(&method_name).first_that(intersects, b)!=0;
+static void _intersects(Request& r, MethodParams& params) {
+	bool result=false;
+
+	Value& vb=params.as_no_junction(0, "param must be hash");
+	if(HashStringValue* b=vb.get_hash())
+		result=GET_SELF(r, VHash).hash().first_that<HashStringValue*>(intersects, b)!=0;
 
 	// return result
-	Value& result=*new(pool) VBool(pool, yes);
-	result.set_name(method_name);
-	r.write_no_lang(result);
+	r.write_no_lang(VBool::get(result));
 }
 
 
-static void _sql(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
+extern String sql_bind_name;
+extern String sql_limit_name;
+extern String sql_offset_name;
+extern String sql_default_name;
+extern String sql_distinct_name;
+extern String sql_value_type_name;
+extern Table2hash_value_type get_value_type(Value& vvalue_type);
+extern int marshal_binds(HashStringValue& hash, SQL_Driver::Placeholder*& placeholders);
+extern void unmarshal_bind_updates(HashStringValue& hash, int placeholder_count, SQL_Driver::Placeholder* placeholders);
 
-	Value& statement=params->as_junction(0, "statement must be code");
+static void _sql(Request& r, MethodParams& params) {
+	Value& statement=params.as_junction(0, "statement must be code");
 
-	ulong limit=0;
+	HashStringValue* bind=0;
+	ulong limit=SQL_NO_LIMIT;
 	ulong offset=0;
-	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(*vlimit).as_double();
-				if(Value *voffset=(Value *)options->get(*sql_offset_name))
-					offset=(ulong)r.process(*voffset).as_double();
+	bool distinct=false;
+	Table2hash_value_type value_type=C_HASH;
+	if(params.count()>1) {
+		Value& voptions=params.as_no_junction(1, "options must be hash, not code");
+		if(voptions.is_defined() && !voptions.is_string())
+			if(HashStringValue* options=voptions.get_hash()) {
+				int valid_options=0;
+				if(Value* vbind=options->get(sql_bind_name)) {
+					valid_options++;
+					bind=vbind->get_hash();
+				}
+				if(Value* vlimit=options->get(sql_limit_name)) {
+					valid_options++;
+					limit=(ulong)r.process_to_value(*vlimit).as_double();
+				}
+				if(Value* voffset=options->get(sql_offset_name)) {
+					valid_options++;
+					offset=(ulong)r.process_to_value(*voffset).as_double();
+				}
+				if(Value* vdistinct=options->get(sql_distinct_name)) {
+					valid_options++;
+					distinct=r.process_to_value(*vdistinct).as_bool();
+				}
+				if(Value* vvalue_type=options->get(sql_value_type_name)) {
+					valid_options++;
+					value_type=get_value_type(r.process_to_value(*vvalue_type));
+				}
+				if(valid_options!=options->count())
+					throw Exception(PARSER_RUNTIME,
+						0,
+						"called with invalid option");
 			} else
-				throw Exception(0, 0,
-					&method_name,
+				throw Exception(PARSER_RUNTIME,
+					0,
 					"options must be hash");
 	}
 
-	Temp_lang temp_lang(r, String::UL_SQL);
-	const String& statement_string=r.process(statement).as_string();
-	const char *statement_cstr=
-		statement_string.cstr(String::UL_UNSPECIFIED, r.connection(&method_name));
-	Hash& hash=static_cast<VHash *>(r.self)->hash(&method_name);
+	SQL_Driver::Placeholder* placeholders=0;
+	uint placeholders_count=0;
+	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(String::L_AS_IS, r.connection());
+
+	HashStringValue& hash=GET_SELF(r, VHash).hash();
 	hash.clear();	
-	Hash_sql_event_handlers handlers(pool, method_name,
-		statement_string, statement_cstr, hash);
+	Hash_sql_event_handlers handlers(
+		statement_string, statement_cstr, 
+		distinct,
+		hash,
+		value_type);
 
-	r.connection(&method_name)->query(
-		statement_cstr, offset, limit,
-		handlers);
-}
+	r.connection()->query(
+		statement_cstr, 
+		placeholders_count, placeholders,
+		offset, limit,
+		handlers,
+		statement_string);
 
-static void keys_collector(const Hash::Key& key, Hash::Val *value, void *info) {
-	Table& table=*static_cast<Table *>(info);
-	Pool& pool=table.pool();
+	if(bind)
+		unmarshal_bind_updates(*bind, placeholders_count, placeholders);
+}
 
-	Array& row=*new(pool) Array(pool);
-	row+=&key;
-	table+=&row;
+static void keys_collector(
+			   HashStringValue::key_type key, 
+			   HashStringValue::value_type, 
+			   Table *table) {
+	Table::element_type row(new ArrayString);
+	*row+=new String(key, String::L_TAINTED);
+	*table+=row;
 }
-static void _keys(Request& r, const String& method_name, MethodParams *) {
-	Pool& pool=r.pool();
+static void _keys(Request& r, MethodParams& params) {
+	const String* keys_column_name;
+	if(params.count()>0)
+		keys_column_name=&params.as_string(0, COLUMN_NAME_MUST_BE_STRING);
+	else 
+		keys_column_name=new String("key");
 
-	Array& columns=*new(pool) Array(pool);
-	columns+=new(pool) String(pool, "key");
-	Table& table=*new(pool) Table(pool, &method_name, &columns);
+	Table::columns_type columns(new ArrayString);
+	*columns+=keys_column_name;
+	Table* table=new Table(columns);
 
-	static_cast<VHash *>(r.self)->hash(&method_name).for_each(keys_collector, &table);
+	GET_SELF(r, VHash).hash().for_each<Table*>(keys_collector, table);
 
-	VTable& result=*new(pool) VTable(pool, &table);
-	result.set_name(method_name);
-	r.write_no_lang(result);
+	r.write_no_lang(*new VTable(table));
 }
 
-static void _count(Request& r, const String& method_name, MethodParams *) {
-	Pool& pool=r.pool();
-
-	Value& result=*new(pool) VInt(pool, static_cast<VHash *>(r.self)->hash(&method_name).size());
-	result.set_name(method_name);
-	r.write_no_lang(result);
+static void _count(Request& r, MethodParams&) {
+	r.write_no_lang(*new VInt(GET_SELF(r, VHash).hash().count()));
 }
 
-static void _delete(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
+static void _delete(Request& r, MethodParams& params) {
 
-	static_cast<VHash *>(r.self)->hash(&method_name).remove(params->as_string(0, "key must be string"));
+	GET_SELF(r, VHash).hash().remove(params.as_string(0, "key must be string"));
+}
+
+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(VBool::get(result));
 }
 
 #ifndef DOXYGEN
@@ -270,58 +418,71 @@ struct Foreach_info {
 	Request *r;
 	const String* key_var_name;
 	const String* value_var_name;
-	Value *body_code;
-	Value *delim_maybe_code;
+	Value* body_code;
+	Value* delim_maybe_code;
 
-	VString *vkey;
+	Value* var_context;
 	bool need_delim;
 };
 #endif
+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){
+		VString* vkey=new VString(*new String(akey, String::L_TAINTED));
+		var_context.put_element(var_context, *info->key_var_name, vkey, false);
+	}
+	if(info->value_var_name)
+		var_context.put_element(var_context, *info->value_var_name, avalue, false);
 
-static void one_foreach_cycle(const Hash::Key& akey, Hash::Val *avalue, 
-										  void *info) {
-	Foreach_info& i=*static_cast<Foreach_info *>(info);
-
-	i.vkey->set_string(akey);
-	i.r->root->put_element(*i.key_var_name, i.vkey);
-	i.r->root->put_element(*i.value_var_name, static_cast<Value *>(avalue));
-
-	Value& processed_body=i.r->process(*i.body_code);
-	if(i.delim_maybe_code) { // delimiter set?
-		const String *string=processed_body.get_string();
-		if(i.need_delim && string && string->size()) // need delim & iteration produced string?
-			i.r->write_pass_lang(i.r->process(*i.delim_maybe_code));
-		i.need_delim=true;
-	}
-	i.r->write_pass_lang(processed_body);
-}
-static void _foreach(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
-	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");
-	Value& body_code=params->as_junction(2, "body must be code");
-	Value *delim_maybe_code=params->size()>3?&params->get(3):0;
+	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,
-		&key_var_name, &value_var_name,
-		&body_code,
-		delim_maybe_code,
-
-		new(pool) VString(pool),
+		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"),
+		/*delimiter*/params.count()>3?params.get(3):0,
+		/*var_context*/r.get_method_frame()->caller(),
 		false
 	};
-	VHash& self=*static_cast<VHash *>(r.self);
-	Hash& hash=self.hash(&method_name);
+
+	VHash& self=GET_SELF(r, VHash);
+	HashStringValue& hash=self.hash();
 	VHash_lock lock(self);
-	hash.for_each(one_foreach_cycle, &info);
+	hash.first_that<Foreach_info*>(one_foreach_cycle, &info);
 }
 
 // constructor
 
-MHash::MHash(Pool& apool) : Methoded(apool) {
-	set_name(*NEW String(pool(), HASH_CLASS_NAME));
-
+MHash::MHash(): Methoded("hash") 
+{
 	// ^hash::create[[copy_from]]
 	add_native_method("create", Method::CT_DYNAMIC, _create_or_add, 0, 1);
 	// ^hash.add[add_from]
@@ -338,11 +499,16 @@ MHash::MHash(Pool& apool) : Methoded(apo
 	// ^a.delete[key]
 	add_native_method("delete", Method::CT_DYNAMIC, _delete, 1, 1);
 
-	// ^hash:sql[query][$.limit(1) $.offset(2)]
+	// ^a.contains[key]
+	add_native_method("contains", Method::CT_DYNAMIC, _contains, 1, 1);
+	// backward
+	add_native_method("contain", Method::CT_DYNAMIC, _contains, 1, 1);
+
+	// ^hash::sql[query][options hash]
 	add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 2);
 
-	// ^hash._keys[]
-	add_native_method("_keys", Method::CT_DYNAMIC, _keys, 0, 0);	
+	// ^hash._keys[[column name]]
+	add_native_method("_keys", Method::CT_DYNAMIC, _keys, 0, 1);	
 
 	// ^hash._count[]
 	add_native_method("_count", Method::CT_DYNAMIC, _count, 0, 0);	
@@ -350,13 +516,3 @@ MHash::MHash(Pool& apool) : Methoded(apo
 	// ^hash.foreach[key;value]{code}[delim]
 	add_native_method("foreach", Method::CT_DYNAMIC, _foreach, 2+1, 2+1+1);
 }
-
-// global variable
-
-Methoded *hash_base_class;
-
-// creator
-
-Methoded *MHash_create(Pool& pool) {
-	return hash_base_class=new(pool) MHash(pool);
-}