--- parser3/src/classes/hash.C	2009/04/16 01:10:21	1.89
+++ parser3/src/classes/hash.C	2009/07/06 08:49:49	1.97
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_HASH_C="$Date: 2009/04/16 01:10:21 $";
+static const char * const IDENT_HASH_C="$Date: 2009/07/06 08:49:49 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -22,7 +22,7 @@ static const char * const IDENT_HASH_C="
 
 class MHash: public Methoded {
 public: // VStateless_class
-	Value* create_new_value(Pool&, HashStringValue&) { return new VHash(); }
+	Value* create_new_value(Pool&, HashStringValue*) { return new VHash(); }
 
 public:
 	MHash();
@@ -76,7 +76,7 @@ public:
 
 	bool add_column(SQL_Error& error, const char* str, size_t length) {
 		try {
-			columns+=new String(str, length, true);
+			columns+=new String(str, String::L_TAINTED, length);
 			return false;
 		} catch(...) {
 			error=SQL_Error("exception occured in Hash_sql_event_handlers::add_column");
@@ -115,9 +115,7 @@ public:
 
 	bool add_row_cell(SQL_Error& error, const char *ptr, size_t length) {
 		try {
-			String& cell=*new String;
-			if(length)
-				cell.append_know_length(ptr, length, String::L_TAINTED);
+			String& cell=*new String(ptr, String::L_TAINTED, length);
 
 			bool duplicate=false;
 			if(one_bool_column) {
@@ -356,8 +354,8 @@ static void _sql(Request& r, MethodParam
 
 	Temp_lang temp_lang(r, String::L_SQL);
 	const String& statement_string=r.process_to_string(statement);
-	const char* statement_cstr=
-		statement_string.cstr(String::L_UNSPECIFIED, r.connection());
+	const char* statement_cstr=statement_string.cstr(String::L_UNSPECIFIED, r.connection());
+
 	HashStringValue& hash=GET_SELF(r, VHash).hash();
 	hash.clear();	
 	Hash_sql_event_handlers handlers(
@@ -424,36 +422,39 @@ struct Foreach_info {
 	Value* delim_maybe_code;
 
 	Value* var_context;
-	VString* vkey;
 	bool need_delim;
 };
 #endif
-static bool one_foreach_cycle(						   
-			      HashStringValue::key_type akey, 
-			      HashStringValue::value_type avalue, 
-			      Foreach_info *info) {
+static bool one_foreach_cycle(
+				HashStringValue::key_type akey, 
+				HashStringValue::value_type avalue, 
+				Foreach_info *info) {
 	Value& var_context=*info->var_context;
 	if(info->key_var_name){
-		info->vkey->set_string(*new String(akey, String::L_TAINTED));
-		var_context.put_element(var_context, *info->key_var_name, info->vkey, false);
+		VString* vkey=new VString(*new String(akey, String::L_TAINTED));
+		var_context.put_element(var_context, *info->key_var_name, vkey, false);
 	}
 	if(info->value_var_name)
 		var_context.put_element(var_context, *info->value_var_name, avalue, 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?
-			info->r->write_pass_lang(info->r->process(*info->delim_maybe_code));
-		else
-			info->need_delim=true;
+	if(info->delim_maybe_code){ // delimiter set
+		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(s_processed && !s_processed->is_empty()) { // 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
+				info->need_delim=true;
+		}
+		info->r->write_pass_lang(sv_processed);
+		return lskip==Request::SKIP_BREAK;
+	} else {
+		info->r->process_write(*info->body_code);
+		Request::Skip lskip=info->r->get_skip(); info->r->set_skip(Request::SKIP_NOTHING);
+		return lskip==Request::SKIP_BREAK;
 	}
-
-	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*> 
@@ -469,7 +470,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,
 		false
 	};