--- parser3/src/classes/hashfile.C	2008/05/19 08:56:59	1.44
+++ parser3/src/classes/hashfile.C	2016/09/29 18:49:42	1.58
@@ -1,12 +1,10 @@
 /** @file
 	Parser: @b hashfile parser class.
 
-	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT="$Id: hashfile.C,v 1.44 2008/05/19 08:56:59 misha Exp $";
-
 #include "classes.h"
 
 #include "pa_request.h"
@@ -14,25 +12,20 @@ static const char * const IDENT="$Id: ha
 #include "pa_vhashfile.h"
 #include "pa_vhash.h"
 
+volatile const char * IDENT_HASHFILE_C="$Id: hashfile.C,v 1.58 2016/09/29 18:49:42 moko Exp $";
+
 // class
 
 class MHashfile : public Methoded {
 public: // VStateless_class
-	Value *create_new_value(Pool& apool, HashStringValue&) { return new VHashfile(apool); }
-
+	Value *create_new_value(Pool& apool) { return new VHashfile(apool); }
 public:
 	MHashfile();
-public: // Methoded
-	bool used_directly() { return true; }
 };
 
 // global variable
 
-DECLARE_CLASS_VAR(hashfile, new MHashfile, 0);
-
-// externs
-
-extern String cycle_data_name;
+DECLARE_CLASS_VAR(hashfile, new MHashfile);
 
 // defines for statics
 
@@ -40,7 +33,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,30 +89,28 @@ 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) {
+				const String::Body key,
+				const String& value,
+				void* ainfo) {
 	Foreach_info& info=*static_cast<Foreach_info*>(ainfo);
 	if(info.key_var_name){
-		info.vkey->set_string(*new String(key, String::L_TAINTED));
-		info.var_context->put_element(*info.var_context, *info.key_var_name, info.vkey, false);
+		VString* vkey=new VString(*new String(key, String::L_TAINTED));
+		info.r->put_element(*info.var_context, *info.key_var_name, vkey);
 	}
 	if(info.value_var_name){
-		info.vvalue->set_string(value);
-		info.var_context->put_element(*info.var_context, *info.value_var_name, info.vvalue, false);
+		VString* vvalue=new VString(value);
+		info.r->put_element(*info.var_context, *info.value_var_name, vvalue);
 	}
 
-	StringOrValue sv_processed=info.r->process(*info.body_code);
+	Value& 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));
 		else
@@ -131,8 +122,7 @@ static bool one_foreach_cycle(
 	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);
+	InCycle temp(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");
@@ -144,8 +134,6 @@ static void _foreach(Request& r, MethodP
 		&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,
 		false
 	};