--- parser3/src/classes/hash.C	2012/06/13 22:53:47	1.115
+++ parser3/src/classes/hash.C	2015/03/12 08:18:18	1.121
@@ -16,7 +16,7 @@
 #include "pa_vbool.h"
 #include "pa_vmethod_frame.h"
 
-volatile const char * IDENT_HASH_C="$Id: hash.C,v 1.115 2012/06/13 22:53:47 moko Exp $";
+volatile const char * IDENT_HASH_C="$Id: hash.C,v 1.121 2015/03/12 08:18:18 misha Exp $";
 
 // class
 
@@ -107,9 +107,9 @@ public:
 		return false;
 	}
 
-	bool add_row_cell(SQL_Error& error, const char *ptr, size_t ) {
+	bool add_row_cell(SQL_Error& error, const char *str, size_t ) {
 		try {
-			String& cell=*new String(ptr, String::L_TAINTED /* no length as 0x00 can be inside */);
+			const String& cell=str?*new String(str, String::L_TAINTED /* no length as 0x00 can be inside */):String::Empty;
 
 			bool duplicate=false;
 			if(one_bool_column) {
@@ -277,8 +277,14 @@ static bool intersects(
 static void _intersects(Request& r, MethodParams& params) {
 	bool result=false;
 
-	if(HashStringValue* b=params.as_hash(0, "param"))
-		result=GET_SELF(r, VHash).hash().first_that<HashStringValue*>(intersects, b)!=0;
+	if(HashStringValue* b=params.as_hash(0, "param")) {
+		HashStringValue* self=&(GET_SELF(r, VHash).hash());
+		if(b==self) {
+			r.write_no_lang(VBool::get(true));
+			return;
+		}
+		result=self->first_that<HashStringValue*>(intersects, b)!=0;
+	}
 
 	// return result
 	r.write_no_lang(VBool::get(result));
@@ -387,8 +393,10 @@ static void _count(Request& r, MethodPar
 }
 
 static void _delete(Request& r, MethodParams& params) {
-
-	GET_SELF(r, VHash).hash().remove(params.as_string(0, "key must be string"));
+	if(params.count()>0)
+		GET_SELF(r, VHash).hash().remove(params.as_string(0, "key must be string"));
+	else
+		GET_SELF(r, VHash).hash().clear();
 }
 
 static void _contains(Request& r, MethodParams& params) {
@@ -415,10 +423,10 @@ static bool one_foreach_cycle(
 	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(*info->key_var_name, vkey, false);
+		info->r->put_element(var_context, *info->key_var_name, vkey);
 	}
 	if(info->value_var_name)
-		var_context.put_element(*info->value_var_name, avalue, false);
+		info->r->put_element(var_context, *info->value_var_name, avalue);
 
 	if(info->delim_maybe_code){ // delimiter set
 		StringOrValue sv_processed=info->r->process(*info->body_code);
@@ -461,14 +469,40 @@ static void _foreach(Request& r, MethodP
 	hash.first_that<Foreach_info*>(one_foreach_cycle, &info);
 }
 
+enum AtResultType {
+	AtResultTypeValue = 0,
+	AtResultTypeKey = 1,
+	AtResultTypeHash = 2
+};
+
+inline Value& SingleElementHash(String::Body akey, Value* avalue) {
+	Value& result=*new VHash;
+	result.put_element(*new String(akey, String::L_TAINTED), avalue);
+	return result;
+}
+
 static void _at(Request& r, MethodParams& params) {
 	HashStringValue& hash=GET_SELF(r, VHash).hash_ro();
 	size_t count=hash.count();
 
 	int pos=0;
 
+	// misha@
+	// I do not like that type is checked before whence.
+	// But I do not like the idea to move it after whence (where process_to_value can be called) even more.
+	AtResultType result_type=AtResultTypeValue;
+	if(params.count() > 1) {
+		const String& stype=params.as_string(1, "type must be string");
+		if(stype == "key")
+			result_type=AtResultTypeKey;
+		else if(stype == "hash")
+			result_type=AtResultTypeHash;
+		else if(stype != "value")
+			throw Exception(PARSER_RUNTIME, &stype, "type must be 'key', 'value' or 'hash'");
+	}
+
 	Value& vwhence=*params.get(0);
-	if(vwhence.is_string()){
+	if(vwhence.is_string()) {
 		const String& swhence=*vwhence.get_string();
 		if(swhence == "last")
 			pos=count-1;
@@ -483,18 +517,54 @@ static void _at(Request& r, MethodParams
 	}
 
 	if(count && pos >= 0 && (size_t)pos < count){
-		if(pos == 0)
-			r.write_assign_lang(*hash.first_value());
-		else if((size_t)pos == count-1)
-			r.write_assign_lang(*hash.last_value());
-		else
-			for(HashStringValue::Iterator i(hash); i; i.next(), pos-- )
-				if(!pos){
-					r.write_assign_lang(*i.value());
+		switch(result_type) {
+			case AtResultTypeKey:
+				{
+					if(pos == 0) {
+						r.write_assign_lang(*new VString(*new String(hash.first_key(), String::L_TAINTED)));
+					} else if((size_t)pos == count-1) {
+						r.write_assign_lang(*new VString(*new String(hash.last_key(), String::L_TAINTED)));
+					} else {
+						for(HashStringValue::Iterator i(hash); i; i.next(), pos-- )
+							if(!pos){
+								r.write_assign_lang(*new VString(*new String(i.key(), String::L_TAINTED)));
+								break;
+							}
+					}
+					break;
+				}
+			case AtResultTypeValue:
+				{
+					if(pos == 0) {
+						r.write_assign_lang(*hash.first_value());
+					} else if((size_t)pos == count-1) {
+						r.write_assign_lang(*hash.last_value());
+					} else {
+						for(HashStringValue::Iterator i(hash); i; i.next(), pos-- )
+							if(!pos){
+								r.write_assign_lang(*i.value());
+								break;
+							}
+					}
 					break;
 				}
+			case AtResultTypeHash:
+				{
+					if(pos == 0) {
+						r.write_no_lang(SingleElementHash(hash.first_key(), hash.first_value()));
+					} else if((size_t)pos == count-1) {
+						r.write_no_lang(SingleElementHash(hash.last_key(), hash.last_value()));
+					} else {
+						for(HashStringValue::Iterator i(hash); i; i.next(), pos-- )
+							if(!pos){
+								r.write_no_lang(SingleElementHash(i.key(), i.value()));
+								break;
+							}
+					}
+					break;
+				}
+		}
 	}
-	
 }
 
 // constructor
@@ -515,7 +585,7 @@ MHash::MHash(): Methoded("hash")
 	add_native_method("intersects", Method::CT_DYNAMIC, _intersects, 1, 1);
 
 	// ^a.delete[key]
-	add_native_method("delete", Method::CT_DYNAMIC, _delete, 1, 1);
+	add_native_method("delete", Method::CT_DYNAMIC, _delete, 0, 1);
 
 	// ^a.contains[key]
 	add_native_method("contains", Method::CT_DYNAMIC, _contains, 1, 1);
@@ -534,7 +604,7 @@ MHash::MHash(): Methoded("hash")
 	// ^hash.foreach[key;value]{code}[delim]
 	add_native_method("foreach", Method::CT_DYNAMIC, _foreach, 2+1, 2+1+1);
 
-	// ^hash._at[first|last]
-	// ^hash._at([-]offset)
-	add_native_method("_at", Method::CT_DYNAMIC, _at, 1, 1);
+	// ^hash._at[first|last[;'key'|'value'|'hash']]
+	// ^hash._at([-+]offset)[['key'|'value'|'hash']]
+	add_native_method("_at", Method::CT_DYNAMIC, _at, 1, 2);
 }