--- parser3/src/classes/hash.C	2007/09/17 15:14:31	1.81
+++ parser3/src/classes/hash.C	2008/05/16 14:28:23	1.85
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_HASH_C="$Date: 2007/09/17 15:14:31 $";
+static const char * const IDENT_HASH_C="$Date: 2008/05/16 14:28:23 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -328,9 +328,9 @@ static void _delete(Request& r, MethodPa
 	GET_SELF(r, VHash).hash().remove(params.as_string(0, "key must be string"));
 }
 
-static void _contain(Request& r, MethodParams& params) {
+static void _contains(Request& r, MethodParams& params) {
 
-	bool result = GET_SELF(r, VHash).hash().contain(params.as_string(0, "key must be string"));
+	bool result = GET_SELF(r, VHash).hash().contains(params.as_string(0, "key must be string"));
 	r.write_no_lang(*new VBool(result));
 }
 
@@ -342,6 +342,7 @@ struct Foreach_info {
 	Value* body_code;
 	Value* delim_maybe_code;
 
+	Value* var_context;
 	VString* vkey;
 	bool need_delim;
 };
@@ -350,19 +351,25 @@ 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);
+	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);
 
 	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));
-		info->need_delim=true;
+		else
+			info->need_delim=true;
 	}
+
 	info->r->write_pass_lang(sv_processed);
 
 	return lskip==Request::SKIP_BREAK;
@@ -371,12 +378,16 @@ static void _foreach(Request& r, MethodP
 	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
 	};
@@ -407,8 +418,10 @@ MHash::MHash(): Methoded("hash")
 	// ^a.delete[key]
 	add_native_method("delete", Method::CT_DYNAMIC, _delete, 1, 1);
 
-	// ^a.contain[key]
-	add_native_method("contain", Method::CT_DYNAMIC, _contain, 1, 1);
+	// ^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);