--- parser3/src/classes/hash.C 2005/08/26 12:01:38 1.76 +++ parser3/src/classes/hash.C 2006/04/09 12:25:03 1.76.12.1 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_HASH_C="$Date: 2005/08/26 12:01:38 $"; +static const char * const IDENT_HASH_C="$Date: 2006/04/09 12:25:03 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -127,7 +127,7 @@ static void _create_or_add(Request& r, M HashStringValue* self_hash=&(self.hash()); if(src==self_hash) // same: doing nothing return; - src->for_each(copy_all_overwrite_to, self_hash); + src->for_each(copy_all_overwrite_to, self_hash); if(VHash* vhash_src=static_cast(vsrc.as(VHASH_TYPE, false))) self.set_default(vhash_src->get_default()); @@ -149,7 +149,7 @@ static void _sub(Request& r, MethodParam self->clear(); return; } - src->for_each(remove_key_from, self); + src->for_each(remove_key_from, self); } } @@ -165,7 +165,7 @@ static void _union(Request& r, MethodPar // dest += b 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()); + src->for_each(copy_all_dontoverwrite_to, result.get_hash()); // return result r.write_no_lang(result); @@ -190,7 +190,7 @@ static void _intersection(Request& r, Me Value& vb=params.as_no_junction(0, "param must be hash"); if(HashStringValue* b=vb.get_hash()) { Copy_intersection_to_info info={b, result.get_hash()}; - GET_SELF(r, VHash).hash().for_each(copy_intersection_to, &info); + GET_SELF(r, VHash).hash().for_each(copy_intersection_to, &info); } // return result @@ -209,7 +209,7 @@ static void _intersects(Request& r, Meth Value& vb=params.as_no_junction(0, "param must be hash"); if(HashStringValue* b=vb.get_hash()) - result=GET_SELF(r, VHash).hash().first_that(intersects, b)!=0; + result=GET_SELF(r, VHash).hash().first_that(intersects, b)!=0; // return result r.write_no_lang(*new VBool(result)); @@ -307,7 +307,7 @@ static void _keys(Request& r, MethodPara *columns+=keys_column_name; Table* table=new Table(columns); - GET_SELF(r, VHash).hash().for_each(keys_collector, table); + GET_SELF(r, VHash).hash().for_each(keys_collector, table); r.write_no_lang(*new VTable(table)); } @@ -365,7 +365,7 @@ static void _foreach(Request& r, MethodP VHash& self=GET_SELF(r, VHash); HashStringValue& hash=self.hash(); VHash_lock lock(self); - hash.for_each(one_foreach_cycle, &info); + hash.for_each(one_foreach_cycle, &info); } // constructor