--- parser3/src/classes/hashfile.C	2005/07/28 11:23:01	1.34
+++ parser3/src/classes/hashfile.C	2006/04/09 13:38:46	1.37
@@ -1,12 +1,11 @@
 /** @file
 	Parser: @b hashfile 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="$Id: hashfile.C,v 1.34 2005/07/28 11:23:01 paf Exp $";
+static const char * const IDENT="$Id: hashfile.C,v 1.37 2006/04/09 13:38:46 paf Exp $";
 
 #include "classes.h"
 
@@ -31,12 +30,34 @@ public: // Methoded
 
 DECLARE_CLASS_VAR(hashfile, new MHashfile, 0);
 
+// externs
+
+extern String cycle_data_name;
+
+// defines for statics
+
+#define OPEN_DATA_NAME "HASHFILE-OPEN-DATA"
+
 // methods
 
+typedef Hash<const String::Body, bool> HashStringBool;
+
 static void _open(Request& r, MethodParams& params) {
+	HashStringBool* file_list=static_cast<HashStringBool*>(r.classes_conf.get(OPEN_DATA_NAME));
+	if(!file_list) {
+		file_list=new HashStringBool();
+		r.classes_conf.put(OPEN_DATA_NAME, file_list);
+	}
+
+	const String& file_spec=r.absolute(params.as_string(0, "filename must be string"));
+	if(file_list->get(file_spec))
+		throw Exception("parser.runtime",
+			0,
+			"this hashfile is already opened, use existing variable");
+	file_list->put(file_spec, true);
+
 	VHashfile& self=GET_SELF(r, VHashfile);
-	
-	self.open(r.absolute(params.as_string(0, "filename must be string")));
+	self.open(file_spec);
 }
 
 static void _hash(Request& r, MethodParams&) {
@@ -80,7 +101,7 @@ struct Foreach_info {
 	bool need_delim;
 };
 #endif
-static void 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);
@@ -88,6 +109,7 @@ static void one_foreach_cycle(const Stri
 	info.var_context->put_element(*info.var_context, *info.value_var_name, info.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.need_delim) // need delim & iteration produced string?
@@ -95,8 +117,13 @@ static void one_foreach_cycle(const Stri
 		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);
+
 	VHashfile& self=GET_SELF(r, VHashfile);
 
 	Foreach_info info;