--- parser3/src/classes/hashfile.C	2007/08/20 10:02:51	1.41
+++ parser3/src/classes/hashfile.C	2009/07/24 09:29:15	1.49
@@ -1,11 +1,11 @@
 /** @file
 	Parser: @b hashfile parser class.
 
-	Copyright (c) 2001-2005 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)
 */
 
-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.49 2009/07/24 09:29:15 misha Exp $";
 
 #include "classes.h"
 
@@ -18,7 +18,7 @@ static const char * const IDENT="$Id: ha
 
 class MHashfile : public Methoded {
 public: // VStateless_class
-	Value *create_new_value(Pool& apool, HashStringValue&) { return new VHashfile(apool); }
+	Value *create_new_value(Pool& apool, HashStringValue*) { return new VHashfile(apool); }
 
 public:
 	MHashfile();
@@ -40,7 +40,7 @@ extern String cycle_data_name;
 
 // methods
 
-typedef Hash<const String::Body, bool> HashStringBool;
+typedef HashString<bool> HashStringBool;
 
 static void _open(Request& r, MethodParams& params) {
 	HashStringBool* file_list=static_cast<HashStringBool*>(r.classes_conf.get(OPEN_DATA_NAME));
@@ -96,26 +96,34 @@ struct Foreach_info {
 	Value* delim_maybe_code;
 
 	Value* var_context;
-	VString* vkey;
-	VString* vvalue;
 	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);
-	info.var_context->put_element(*info.var_context, *info.key_var_name, info.vkey, false);
-	info.var_context->put_element(*info.var_context, *info.value_var_name, info.vvalue, false);
+	if(info.key_var_name){
+		VString* vkey=new VString(*new String(key, String::L_TAINTED));
+		info.var_context->put_element(*info.var_context, *info.key_var_name, vkey, false);
+	}
+	if(info.value_var_name){
+		VString* vvalue=new VString(value);
+		info.var_context->put_element(*info.var_context, *info.value_var_name, vvalue, 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.delim_maybe_code && s_processed && !s_processed->is_empty()) { // 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 +132,20 @@ 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;
+	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");
 
-	info.need_delim=false;
+	Foreach_info info={
+		&r,
+		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
+	};
 
+	VHashfile& self=GET_SELF(r, VHashfile);
 	self.for_each(one_foreach_cycle, &info);
 }