diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | hash.c | 7 | ||||
| -rw-r--r-- | st.c | 10 |
3 files changed, 17 insertions, 7 deletions
@@ -1,3 +1,10 @@ +Thu Nov 14 11:33:47 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * hash.c (foreach_safe_i, hash_foreach_iter): deal with error detected + by ST_CHECK. + + * st.c (st_foreach_check): call with non-error argument in normal case. + Thu Nov 14 02:37:14 2013 Zachary Scott <e@zzak.io> * ext/thread/thread.c: [DOC] This patch accomplishes the following: @@ -141,10 +141,12 @@ struct foreach_safe_arg { }; static int -foreach_safe_i(st_data_t key, st_data_t value, struct foreach_safe_arg *arg) +foreach_safe_i(st_data_t key, st_data_t value, st_data_t args, int error) { int status; + struct foreach_safe_arg *arg = (void *)args; + if (error) return ST_STOP; status = (*arg->func)(key, value, arg->arg); if (status == ST_CONTINUE) { return ST_CHECK; @@ -174,12 +176,13 @@ struct hash_foreach_arg { }; static int -hash_foreach_iter(st_data_t key, st_data_t value, st_data_t argp) +hash_foreach_iter(st_data_t key, st_data_t value, st_data_t argp, int error) { struct hash_foreach_arg *arg = (struct hash_foreach_arg *)argp; int status; st_table *tbl; + if (error) return ST_STOP; tbl = RHASH(arg->hash)->ntbl; status = (*arg->func)((VALUE)key, (VALUE)value, arg->arg); if (RHASH(arg->hash)->ntbl != tbl) { @@ -948,7 +948,7 @@ st_foreach_check(st_table *table, int (*func)(ANYARGS), st_data_t arg, st_data_t val = PVAL(table, i); hash = PHASH(table, i); if (key == never) continue; - retval = (*func)(key, val, arg); + retval = (*func)(key, val, arg, 0); if (!table->entries_packed) { FIND_ENTRY(table, ptr, hash, i); if (retval == ST_CHECK) { @@ -987,7 +987,7 @@ st_foreach_check(st_table *table, int (*func)(ANYARGS), st_data_t arg, st_data_t if (ptr->key == never) goto unpacked_continue; i = ptr->hash % table->num_bins; - retval = (*func)(ptr->key, ptr->record, arg); + retval = (*func)(ptr->key, ptr->record, arg, 0); unpacked: switch (retval) { case ST_CHECK: /* check if hash is modified during iteration */ @@ -1037,7 +1037,7 @@ st_foreach(st_table *table, int (*func)(ANYARGS), st_data_t arg) key = PKEY(table, i); val = PVAL(table, i); hash = PHASH(table, i); - retval = (*func)(key, val, arg); + retval = (*func)(key, val, arg, 0); if (!table->entries_packed) { FIND_ENTRY(table, ptr, hash, i); if (!ptr) return 0; @@ -1064,7 +1064,7 @@ st_foreach(st_table *table, int (*func)(ANYARGS), st_data_t arg) if (ptr != 0) { do { i = ptr->hash % table->num_bins; - retval = (*func)(ptr->key, ptr->record, arg); + retval = (*func)(ptr->key, ptr->record, arg, 0); unpacked: switch (retval) { case ST_CONTINUE: @@ -1105,7 +1105,7 @@ st_reverse_foreach(st_table *table, int (*func)(ANYARGS), st_data_t arg) st_data_t key, val; key = PKEY(table, i); val = PVAL(table, i); - retval = (*func)(key, val, arg); + retval = (*func)(key, val, arg, 0); switch (retval) { case ST_CHECK: /* check if hash is modified during iteration */ for (j = 0; j < table->num_entries; j++) { |