added to ase_map_t a keeper function that is called when a value is replace by itself. deprecated the generic ase_sizer_t and defined context-specific sizer types such as ase_str_sizer_t and ase_map_sizer_t

This commit is contained in:
2008-09-24 08:47:23 +00:00
parent ac92d8581a
commit 21c331febf
5 changed files with 59 additions and 33 deletions

View File

@ -1,5 +1,5 @@
/*
* $Id: map.c 374 2008-09-23 11:37:38Z baconevi $
* $Id: map.c 375 2008-09-23 14:47:23Z baconevi $
*
* {License}
*/
@ -13,6 +13,8 @@
#define freeer_t ase_map_freeer_t
#define hasher_t ase_map_hasher_t
#define comper_t ase_map_comper_t
#define keeper_t ase_map_keeper_t
#define sizer_t ase_map_sizer_t
#define walker_t ase_map_walker_t
#define KPTR(p) ASE_MAP_KPTR(p)
@ -132,9 +134,9 @@ static pair_t* change_pair_val (
/* if the old value and the new value are the same,
* it just calls the handler for this condition.
* No value replacement occurs. */
if (map->sameval != ASE_NULL)
if (map->keeper != ASE_NULL)
{
map->sameval (map, vptr, vlen);
map->keeper (map, vptr, vlen);
}
}
else
@ -319,12 +321,22 @@ void ase_map_setcomper (map_t* map, comper_t comper)
map->comper = comper;
}
ase_sizer_t ase_map_getsizer (map_t* map)
keeper_t ase_map_getkeeper (map_t* map)
{
return map->keeper;
}
void ase_map_setkeeper (map_t* map, keeper_t keeper)
{
map->keeper = keeper;
}
sizer_t ase_map_getsizer (map_t* map)
{
return map->sizer;
}
void ase_map_setsizer (map_t* map, ase_sizer_t sizer)
void ase_map_setsizer (map_t* map, sizer_t sizer)
{
map->sizer = sizer;
}

View File

@ -1,5 +1,5 @@
/*
* $Id: str_dyn.c 373 2008-09-23 11:27:24Z baconevi $
* $Id: str_dyn.c 375 2008-09-23 14:47:23Z baconevi $
*
* {License}
*/
@ -82,12 +82,12 @@ int ase_str_yield (ase_str_t* str, ase_xstr_t* buf, int new_capa)
return 0;
}
ase_sizer_t ase_str_getsizer (ase_str_t* str)
ase_str_sizer_t ase_str_getsizer (ase_str_t* str)
{
return str->sizer;
}
void ase_str_setsizer (ase_str_t* str, ase_sizer_t sizer)
void ase_str_setsizer (ase_str_t* str, ase_str_sizer_t sizer)
{
str->sizer = sizer;
}