--- parser3/src/classes/hash.C	2005/06/06 08:45:11	1.73
+++ parser3/src/classes/hash.C	2006/06/09 19:03:49	1.78
@@ -1,11 +1,11 @@
 /** @file
 	Parser: @b hash parser class.
 
-	Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_HASH_C="$Date: 2005/06/06 08:45:11 $";
+static const char * const IDENT_HASH_C="$Date: 2006/06/09 19:03:49 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -22,7 +22,7 @@ static const char * const IDENT_HASH_C="
 
 class MHash: public Methoded {
 public: // VStateless_class
-	Value* create_new_value(Pool&) { return new VHash(); }
+	Value* create_new_value(Pool&, HashStringValue&) { return new VHash(); }
 
 public:
 	MHash();
@@ -34,6 +34,10 @@ public: // Methoded
 
 DECLARE_CLASS_VAR(hash, new MHash, 0);
 
+// externs
+
+extern String cycle_data_name;
+
 // methods
 
 #ifndef DOXYGEN
@@ -127,10 +131,18 @@ static void _create_or_add(Request& r, M
 			HashStringValue* self_hash=&(self.hash());
 			if(src==self_hash) // same: doing nothing
 				return;
-			src->for_each(copy_all_overwrite_to, self_hash);
+			src->for_each<HashStringValue*>(copy_all_overwrite_to, self_hash);
 
 			if(VHash* vhash_src=static_cast<VHash*>(vsrc.as(VHASH_TYPE, false)))
-				self.set_default(vhash_src->get_default());
+			{
+				if(Value* vdefault=vhash_src->get_default())
+				{
+					if(vdefault->is_defined())
+					{
+						self.set_default(vdefault);
+					}
+				}
+			}
 		}
 	}
 }
@@ -149,7 +161,7 @@ static void _sub(Request& r, MethodParam
 			self->clear();
 			return;
 		}
-		src->for_each(remove_key_from, self);
+		src->for_each<HashStringValue*>(remove_key_from, self);
 	}
 }
 
@@ -165,7 +177,7 @@ static void _union(Request& r, MethodPar
 	// dest += b
 	Value& vsrc=params.as_no_junction(0, "param must be hash");
 	if(HashStringValue* src=vsrc.get_hash())
-		src->for_each(copy_all_dontoverwrite_to, result.get_hash());
+		src->for_each<HashStringValue*>(copy_all_dontoverwrite_to, result.get_hash());
 
 	// return result
 	r.write_no_lang(result);
@@ -190,7 +202,7 @@ static void _intersection(Request& r, Me
 	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);
+		GET_SELF(r, VHash).hash().for_each<Copy_intersection_to_info*>(copy_intersection_to, &info);
 	}
 
 	// return result
@@ -209,7 +221,7 @@ static void _intersects(Request& r, Meth
 
 	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(intersects, b)!=0;
+		result=GET_SELF(r, VHash).hash().first_that<HashStringValue*>(intersects, b)!=0;
 
 	// return result
 	r.write_no_lang(*new VBool(result));
@@ -233,7 +245,7 @@ static void _sql(Request& r, MethodParam
 	bool distinct=false;
 	if(params.count()>1) {
 		Value& voptions=params.as_no_junction(1, "options must be hash, not code");
-		if(!voptions.is_string())
+		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)) {
@@ -307,7 +319,7 @@ static void _keys(Request& r, MethodPara
 	*columns+=keys_column_name;
 	Table* table=new Table(columns);
 
-	GET_SELF(r, VHash).hash().for_each(keys_collector, table);
+	GET_SELF(r, VHash).hash().for_each<Table*>(keys_collector, table);
 
 	r.write_no_lang(*new VTable(table));
 }
@@ -333,16 +345,17 @@ struct Foreach_info {
 	bool need_delim;
 };
 #endif
-static void one_foreach_cycle(						   
+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(*info->key_var_name, info->vkey, false);
-	ncontext.put_element(*info->value_var_name, avalue, false);
+	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?
@@ -350,8 +363,13 @@ static void one_foreach_cycle(
 		info->need_delim=true;
 	}
 	info->r->write_pass_lang(sv_processed);
+
+	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);
+
 	Foreach_info info={
 		&r,
 		&params.as_string(0, "key-var name must be string"),
@@ -365,7 +383,7 @@ static void _foreach(Request& r, MethodP
 	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