--- parser3/src/classes/hashfile.C	2009/06/16 07:36:01	1.48
+++ parser3/src/classes/hashfile.C	2012/03/16 09:24:07	1.53
@@ -1,12 +1,10 @@
 /** @file
 	Parser: @b hashfile parser class.
 
-	Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2012 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.48 2009/06/16 07:36:01 misha Exp $";
-
 #include "classes.h"
 
 #include "pa_request.h"
@@ -14,26 +12,21 @@ 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.53 2012/03/16 09:24:07 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;
-
 // defines for statics
 
 #define OPEN_DATA_NAME "HASHFILE-OPEN-DATA"
@@ -100,17 +93,17 @@ struct Foreach_info {
 };
 #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){
-		VString* vkey=new VString(*new String(key, String::L_TAINTED));
-		info.var_context->put_element(*info.var_context, *info.key_var_name, vkey, false);
+		VString* vkey=new VString(*new String(key, String::L_TAINTED));
+		info.var_context->put_element(*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);
+		VString* vvalue=new VString(value);
+		info.var_context->put_element(*info.value_var_name, vvalue, false);
 	}
 
 	StringOrValue sv_processed=info.r->process(*info.body_code);
@@ -129,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");