--- parser3/src/classes/hash.C	2003/11/07 13:59:21	1.60
+++ parser3/src/classes/hash.C	2004/02/17 11:08:38	1.66
@@ -1,11 +1,11 @@
 /** @file
 	Parser: @b hash parser class.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_HASH_C="$Date: 2003/11/07 13:59:21 $";
+static const char * const IDENT_HASH_C="$Date: 2004/02/17 11:08:38 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -22,7 +22,7 @@ static const char* IDENT_HASH_C="$Date:
 
 class MHash: public Methoded {
 public: // VStateless_class
-	Value* create_new_value(Pool& apool) { return new VHash(); }
+	Value* create_new_value(Pool&) { return new VHash(); }
 
 public:
 	MHash();
@@ -115,9 +115,13 @@ static void copy_all_overwrite_to(
 }
 static void _create_or_add(Request& r, MethodParams& params) {
 	if(params.count()) {
-		Value& vb=params.as_no_junction(0, "param must be hash");
-		if(HashStringValue* b=vb.get_hash())
-			b->for_each(copy_all_overwrite_to, &(GET_SELF(r, VHash).hash()));
+		Value& vsrc=params.as_no_junction(0, "param must be hash");
+		if(HashStringValue* src=vsrc.get_hash()) {
+			HashStringValue* self=&(GET_SELF(r, VHash).hash());
+			if(src==self) // same: doing nothing
+				return;
+			src->for_each(copy_all_overwrite_to, self);
+		}
 	}
 }
 
@@ -128,9 +132,15 @@ static void remove_key_from(
 	dest->remove(key);
 }
 static void _sub(Request& r, MethodParams& params) {
-	Value& vb=params.as_no_junction(0, "param must be hash");
-	if(HashStringValue* b=vb.get_hash())
-		b->for_each(remove_key_from, &GET_SELF(r, VHash).hash());
+	Value& vsrc=params.as_no_junction(0, "param must be hash");
+	if(HashStringValue* src=vsrc.get_hash()) {
+		HashStringValue* self=&(GET_SELF(r, VHash).hash());
+		if(src==self) { // same: clearing
+			self->clear();
+			return;
+		}
+		src->for_each(remove_key_from, self);
+	}
 }
 
 static void copy_all_dontoverwrite_to(
@@ -143,9 +153,9 @@ static void _union(Request& r, MethodPar
 	// dest = copy of self
 	Value& result=*new VHash(GET_SELF(r, VHash).hash());
 	// dest += b
-	Value& vb=params.as_no_junction(0, "param must be hash");
-	if(HashStringValue* b=vb.get_hash())
-		b->for_each(copy_all_dontoverwrite_to, result.get_hash());
+	Value& vsrc=params.as_no_junction(0, "param must be hash");
+	if(HashStringValue* src=vsrc.get_hash())
+		src->for_each(copy_all_dontoverwrite_to, result.get_hash());
 
 	// return result
 	r.write_no_lang(result);
@@ -251,7 +261,7 @@ static void _sql(Request& r, MethodParam
 
 static void keys_collector(
 			   HashStringValue::key_type key, 
-			   HashStringValue::value_type value, 
+			   HashStringValue::value_type, 
 			   Table *table) {
 	Table::element_type row(new ArrayString);
 	*row+=new String(key, String::L_TAINTED);
@@ -307,13 +317,15 @@ static void one_foreach_cycle(
 	info->r->write_pass_lang(sv_processed);
 }
 static void _foreach(Request& r, MethodParams& params) {
-	Foreach_info info={0};
-	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.vkey=new VString;
+	Foreach_info info={
+		&r,
+		&params.as_string(0, "key-var name must be string"),
+		&params.as_string(1, "value-var name must be string"),
+		&params.as_junction(2, "body must be code"),
+		params.count()>3?params.get(3):0,
+		/*vkey=*/new VString,
+		false
+	};
 
 	VHash& self=GET_SELF(r, VHash);
 	HashStringValue& hash=self.hash();