--- parser3/src/classes/hashfile.C	2007/08/20 10:02:51	1.41
+++ parser3/src/classes/hashfile.C	2008/05/15 09:34:15	1.43
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT="$Id: hashfile.C,v 1.41 2007/08/20 10:02:51 misha Exp $";
+static const char * const IDENT="$Id: hashfile.C,v 1.43 2008/05/15 09:34:15 misha Exp $";
 
 #include "classes.h"
 
@@ -101,7 +101,10 @@ struct Foreach_info {
 	bool need_delim;
 };
 #endif
-static bool one_foreach_cycle(const String::Body key, const String& value, void* ainfo) {
+static bool one_foreach_cycle(
+				  const String::Body key,
+				  const String& value,
+				  void* ainfo) {
 	Foreach_info& info=*static_cast<Foreach_info*>(ainfo);
 	info.vkey->set_string(*new String(key, String::L_TAINTED));
 	info.vvalue->set_string(value);
@@ -110,12 +113,15 @@ static bool one_foreach_cycle(const Stri
 
 	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;
@@ -124,22 +130,19 @@ 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);
 
-	VHashfile& self=GET_SELF(r, VHashfile);
-
-	Foreach_info info;
-	
-	info.r=&r;
-	info.key_var_name=&params.as_string(0, "key-var name must be string");
-	info.value_var_name=&params.as_string(1, "value-var name must be string");
-	info.body_code=&params.as_junction(2, "body must be code");
-	info.delim_maybe_code=params.count()>3?params.get(3):0;
-
-	info.var_context=info.body_code->get_junction()->wcontext;
-	info.vkey=new VString;
-	info.vvalue=new VString;
-
-	info.need_delim=false;
+	Foreach_info info={
+		&r,
+		&params.as_string(0, "key-var name must be string"),
+		&params.as_string(1, "value-var name must be string"),
+		&params.as_junction(2, "body must be code"),
+		/*delimiter*/params.count()>3?params.get(3):0,
+		/*var_context*/r.get_method_frame()->caller(),
+		/*vkey=*/new VString,
+		/*vvalue=*/new VString,
+		/*need_delim*/false
+	};
 
+	VHashfile& self=GET_SELF(r, VHashfile);
 	self.for_each(one_foreach_cycle, &info);
 }