* st.c (st_foreach_check): remove the entry by replacing with never
when ST_DELETE. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35186 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
d0380e2e56
commit
197627354e
@ -1,4 +1,7 @@
|
|||||||
Sat Mar 31 07:47:31 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
Sat Mar 31 07:53:23 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* st.c (st_foreach_check): remove the entry by replacing with never
|
||||||
|
when ST_DELETE.
|
||||||
|
|
||||||
* hash.c (st_foreach_safe): since table is not for VALUE, Qundef is
|
* hash.c (st_foreach_safe): since table is not for VALUE, Qundef is
|
||||||
not special value, so use 0 instead. therefore this function can be
|
not special value, so use 0 instead. therefore this function can be
|
||||||
|
2
hash.c
2
hash.c
@ -158,8 +158,8 @@ hash_foreach_iter(st_data_t key, st_data_t value, st_data_t argp, int err)
|
|||||||
}
|
}
|
||||||
switch (status) {
|
switch (status) {
|
||||||
case ST_DELETE:
|
case ST_DELETE:
|
||||||
st_delete_safe(tbl, &key, 0, (st_data_t)Qundef);
|
|
||||||
FL_SET(arg->hash, HASH_DELETED);
|
FL_SET(arg->hash, HASH_DELETED);
|
||||||
|
return ST_DELETE;
|
||||||
case ST_CONTINUE:
|
case ST_CONTINUE:
|
||||||
break;
|
break;
|
||||||
case ST_STOP:
|
case ST_STOP:
|
||||||
|
21
st.c
21
st.c
@ -130,6 +130,15 @@ remove_packed_entry(st_table *table, st_index_t i)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline void
|
||||||
|
remove_safe_packed_entry(st_table *table, st_index_t i, st_data_t never)
|
||||||
|
{
|
||||||
|
table->num_entries--;
|
||||||
|
PKEY_SET(table, i, never);
|
||||||
|
PVAL_SET(table, i, never);
|
||||||
|
PHASH_SET(table, i, 0);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* MINSIZE is the minimum size of a dictionary.
|
* MINSIZE is the minimum size of a dictionary.
|
||||||
*/
|
*/
|
||||||
@ -761,10 +770,7 @@ st_delete_safe(register st_table *table, register st_data_t *key, st_data_t *val
|
|||||||
if (i < table->real_entries) {
|
if (i < table->real_entries) {
|
||||||
if (value != 0) *value = PVAL(table, i);
|
if (value != 0) *value = PVAL(table, i);
|
||||||
*key = PKEY(table, i);
|
*key = PKEY(table, i);
|
||||||
PKEY_SET(table, i, never);
|
remove_safe_packed_entry(table, i, never);
|
||||||
PVAL_SET(table, i, never);
|
|
||||||
PHASH_SET(table, i, 0);
|
|
||||||
table->num_entries--;
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
if (value != 0) *value = 0;
|
if (value != 0) *value = 0;
|
||||||
@ -936,8 +942,7 @@ st_foreach_check(st_table *table, int (*func)(ANYARGS), st_data_t arg, st_data_t
|
|||||||
case ST_STOP:
|
case ST_STOP:
|
||||||
return 0;
|
return 0;
|
||||||
case ST_DELETE:
|
case ST_DELETE:
|
||||||
remove_packed_entry(table, i);
|
remove_safe_packed_entry(table, i, never);
|
||||||
i--;
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -976,9 +981,9 @@ st_foreach_check(st_table *table, int (*func)(ANYARGS), st_data_t arg, st_data_t
|
|||||||
for (; (tmp = *last) != 0; last = &tmp->next) {
|
for (; (tmp = *last) != 0; last = &tmp->next) {
|
||||||
if (ptr == tmp) {
|
if (ptr == tmp) {
|
||||||
tmp = ptr->fore;
|
tmp = ptr->fore;
|
||||||
*last = ptr->next;
|
|
||||||
remove_entry(table, ptr);
|
remove_entry(table, ptr);
|
||||||
st_free_entry(ptr);
|
ptr->key = ptr->record = never;
|
||||||
|
ptr->hash = 0;
|
||||||
if (ptr == tmp) return 0;
|
if (ptr == tmp) return 0;
|
||||||
ptr = tmp;
|
ptr = tmp;
|
||||||
break;
|
break;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user