diff options
| author | 卜部昌平 <[email protected]> | 2019-09-25 13:00:56 +0900 |
|---|---|---|
| committer | 卜部昌平 <[email protected]> | 2019-09-30 10:26:38 +0900 |
| commit | 3632a812c0b1e0bd1c75b2426cbfe9ec1715bb56 () | |
| tree | db9510055be3d7df0eaf29383a4da146b412e0f9 /id_table.c | |
| parent | f56506be0dc7f1a9cb35d8371b04720bef50fd9b (diff) | |
refactor add rb_id_table_foreach_with_replace_with_key
This is a pure refactoring to reduce copy & paste. Also the new function is made visible from other parts of the interpreter, to be used later.
Notes: Merged: https://.com/ruby/ruby/pull/2486
| -rw-r--r-- | id_table.c | 85 |
1 files changed, 45 insertions, 40 deletions
@@ -269,57 +269,62 @@ rb_id_table_delete(struct rb_id_table *tbl, ID id) void rb_id_table_foreach_with_replace(struct rb_id_table *tbl, rb_id_table_foreach_func_t *func, rb_id_table_update_callback_func_t *replace, void *data) { - int i, capa = tbl->capa; - - for (i=0; i<capa; i++) { - if (ITEM_KEY_ISSET(tbl, i)) { - const id_key_t key = ITEM_GET_KEY(tbl, i); - enum rb_id_table_iterator_result ret = (*func)(Qundef, tbl->items[i].val, data); - assert(key != 0); - - if (ret == ID_TABLE_REPLACE) { - VALUE val = tbl->items[i].val; - ret = (*replace)(NULL, &val, data, TRUE); - tbl->items[i].val = val; - } - else if (ret == ID_TABLE_STOP) - return; - } - } } void rb_id_table_foreach(struct rb_id_table *tbl, rb_id_table_foreach_func_t *func, void *data) { - int i, capa = tbl->capa; - for (i=0; i<capa; i++) { - if (ITEM_KEY_ISSET(tbl, i)) { - const id_key_t key = ITEM_GET_KEY(tbl, i); - enum rb_id_table_iterator_result ret = (*func)(key2id(key), tbl->items[i].val, data); - assert(key != 0); - - if (ret == ID_TABLE_DELETE) - hash_delete_index(tbl, i); - else if (ret == ID_TABLE_STOP) - return; - } - } } void rb_id_table_foreach_values(struct rb_id_table *tbl, rb_id_table_foreach_values_func_t *func, void *data) { - int i, capa = tbl->capa; - - for (i=0; i<capa; i++) { - if (ITEM_KEY_ISSET(tbl, i)) { - enum rb_id_table_iterator_result ret = (*func)(tbl->items[i].val, data); - if (ret == ID_TABLE_DELETE) - hash_delete_index(tbl, i); - else if (ret == ID_TABLE_STOP) - return; - } } } |