--- parser3/src/classes/hashfile.C	2007/04/23 14:45:23	1.40
+++ parser3/src/classes/hashfile.C	2020/11/10 22:42:24	1.63
@@ -1,12 +1,10 @@
 /** @file
 	Parser: @b hashfile parser class.
 
-	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2017 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.40 2007/04/23 14:45:23 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.63 2020/11/10 22:42:24 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));
@@ -49,7 +42,7 @@ static void _open(Request& r, MethodPara
 		r.classes_conf.put(OPEN_DATA_NAME, file_list);
 	}
 
-	const String& file_spec=r.absolute(params.as_string(0, "filename must be string"));
+	const String& file_spec=r.full_disk_path(params.as_string(0, FILE_NAME_MUST_BE_STRING));
 	if(file_list->get(file_spec))
 		throw Exception(PARSER_RUNTIME,
 			0,
@@ -65,7 +58,7 @@ static void _hash(Request& r, MethodPara
 	
 	// write out result
 	VHash& result=*new VHash(*self.get_hash());
-	r.write_no_lang(result);
+	r.write(result);
 }
 
 static void _delete(Request& r, MethodParams& params) {
@@ -96,50 +89,55 @@ 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.r->put_element(*info.var_context, *info.key_var_name, vkey);
+	}
+	if(info.value_var_name){
+		VString* vvalue=new VString(value);
+		info.r->put_element(*info.var_context, *info.value_var_name, vvalue);
+	}
+
+	Value& sv_processed=info.r->process(*info.body_code);
+	TempSkip4Delimiter skip(*info.r);
 
-	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;
+			info.r->write(info.r->process(*info.delim_maybe_code));
+		else
+			info.need_delim=true;
 	}
-	info.r->write_pass_lang(sv_processed);
 
-	return lskip==Request::SKIP_BREAK;
+	info.r->write(sv_processed);
+
+	return skip.check_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);
+	InCycle temp(r);
 
-	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[3] : 0,
+		/*var_context*/r.get_method_frame()->caller(),
+		false
+	};
 
+	VHashfile& self=GET_SELF(r, VHashfile);
 	self.for_each(one_foreach_cycle, &info);
 }