1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Introduce hash_iter_status_check function

Browse Source
This commit is contained in:
S.H 2022-10-23 16:17:24 +09:00 committed by GitHub
parent 54cad3123a
commit c8c136265c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
Notes: git 2022-10-23 07:17:44 +00:00 
Merged: https://github.com/ruby/ruby/pull/6564

Merged-By: nobu <nobu@ruby-lang.org>
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
hash.c
View File

@ -1346,15 +1346,8 @@ struct hash_foreach_arg {
}; };
static int static int
hash_ar_foreach_iter(st_data_t key, st_data_t value, st_data_t argp, int error) hash_iter_status_check(int status)
{ {
struct hash_foreach_arg *arg = (struct hash_foreach_arg *)argp;
if (error) return ST_STOP;
int status = (*arg->func)((VALUE)key, (VALUE)value, arg->arg);
/* TODO: rehash check? rb_raise(rb_eRuntimeError, "rehash occurred during iteration"); */
switch (status) { switch (status) {
case ST_DELETE: case ST_DELETE:
return ST_DELETE; return ST_DELETE;
@ -1367,6 +1360,19 @@ hash_ar_foreach_iter(st_data_t key, st_data_t value, st_data_t argp, int error)
return ST_CHECK; return ST_CHECK;
} }
static int
hash_ar_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;
if (error) return ST_STOP;
int status = (*arg->func)((VALUE)key, (VALUE)value, arg->arg);
/* TODO: rehash check? rb_raise(rb_eRuntimeError, "rehash occurred during iteration"); */
return hash_iter_status_check(status);
}
static int static int
hash_foreach_iter(st_data_t key, st_data_t value, st_data_t argp, int error) hash_foreach_iter(st_data_t key, st_data_t value, st_data_t argp, int error)
{ {
@ -1381,16 +1387,7 @@ hash_foreach_iter(st_data_t key, st_data_t value, st_data_t argp, int error)
rb_raise(rb_eRuntimeError, "rehash occurred during iteration"); rb_raise(rb_eRuntimeError, "rehash occurred during iteration");
} }
switch (status) { return hash_iter_status_check(status);
case ST_DELETE:
return ST_DELETE;
case ST_CONTINUE:
break;
case ST_STOP:
return ST_STOP;
}
return ST_CHECK;
} }
static int static int