kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

thread.c: use the same method name

Browse source 
* thread.c (exec_recursive): use the same last method name as
  recursive_push in the error message when recursive_pop failed.
  [ruby-core:66742] [Bug #10579]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48752 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-12-10 00:38:43 +00:00
parent bf4b7f3b8c
commit 8cbf4003db
2 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Wed Dec 10 09:38:40 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* thread.c (exec_recursive): use the same last method name as
recursive_push in the error message when recursive_pop failed.
[ruby-core:66742] [Bug #10579]
Wed Dec 10 02:48:46 2014 NAKAMURA Usaku <usa@ruby-lang.org> Wed Dec 10 02:48:46 2014 NAKAMURA Usaku <usa@ruby-lang.org>
* test/net/http/test_https.rb * test/net/http/test_https.rb

29
thread.c
View file

@ -4705,12 +4705,10 @@ ID rb_frame_last_func(void);
*/ */
static VALUE static VALUE
recursive_list_access(void) recursive_list_access(VALUE sym)
{ {
rb_thread_t *th = GET_THREAD(); rb_thread_t *th = GET_THREAD();
VALUE hash = threadptr_recursive_hash(th); VALUE hash = threadptr_recursive_hash(th);
ID mid = rb_frame_last_func();
VALUE sym = mid ? ID2SYM(mid) : ID2SYM(idNULL);
VALUE list; VALUE list;
if (NIL_P(hash) || !RB_TYPE_P(hash, T_HASH)) { if (NIL_P(hash) || !RB_TYPE_P(hash, T_HASH)) {
hash = ident_hash_new(); hash = ident_hash_new();
@ -4798,25 +4796,23 @@ recursive_push(VALUE list, VALUE obj, VALUE paired_obj)
* Assumes the recursion list is valid. * Assumes the recursion list is valid.
*/ */
static void static int
recursive_pop(VALUE list, VALUE obj, VALUE paired_obj) recursive_pop(VALUE list, VALUE obj, VALUE paired_obj)
{ {
if (paired_obj) { if (paired_obj) {
VALUE pair_list = rb_hash_lookup2(list, obj, Qundef); VALUE pair_list = rb_hash_lookup2(list, obj, Qundef);
if (pair_list == Qundef) { if (pair_list == Qundef) {
VALUE symname = rb_inspect(ID2SYM(rb_frame_this_func())); return 0;
VALUE thrname = rb_inspect(rb_thread_current());
rb_raise(rb_eTypeError, "invalid inspect_tbl pair_list for %s in %s",
StringValuePtr(symname), StringValuePtr(thrname));
} }
if (RB_TYPE_P(pair_list, T_HASH)) { if (RB_TYPE_P(pair_list, T_HASH)) {
rb_hash_delete(pair_list, paired_obj); rb_hash_delete(pair_list, paired_obj);
if (!RHASH_EMPTY_P(pair_list)) { if (!RHASH_EMPTY_P(pair_list)) {
return; /* keep hash until is empty */ return 1; /* keep hash until is empty */
} }
} }
} }
rb_hash_delete(list, obj); rb_hash_delete(list, obj);
return 1;
} }
struct exec_recursive_params { struct exec_recursive_params {
@ -4850,9 +4846,11 @@ static VALUE
exec_recursive(VALUE (*func) (VALUE, VALUE, int), VALUE obj, VALUE pairid, VALUE arg, int outer) exec_recursive(VALUE (*func) (VALUE, VALUE, int), VALUE obj, VALUE pairid, VALUE arg, int outer)
{ {
VALUE result = Qundef; VALUE result = Qundef;
const ID mid = rb_frame_last_func();
const VALUE sym = mid ? ID2SYM(mid) : ID2SYM(idNULL);
struct exec_recursive_params p; struct exec_recursive_params p;
int outermost; int outermost;
p.list = recursive_list_access(); p.list = recursive_list_access(sym);
p.objid = rb_obj_id(obj); p.objid = rb_obj_id(obj);
p.obj = obj; p.obj = obj;
p.pairid = pairid; p.pairid = pairid;
@ -4874,8 +4872,8 @@ exec_recursive(VALUE (*func) (VALUE, VALUE, int), VALUE obj, VALUE pairid, VALUE
recursive_push(p.list, ID2SYM(recursive_key), 0); recursive_push(p.list, ID2SYM(recursive_key), 0);
recursive_push(p.list, p.objid, p.pairid); recursive_push(p.list, p.objid, p.pairid);
result = rb_catch_protect(p.list, exec_recursive_i, (VALUE)&p, &state); result = rb_catch_protect(p.list, exec_recursive_i, (VALUE)&p, &state);
recursive_pop(p.list, p.objid, p.pairid); if (!recursive_pop(p.list, p.objid, p.pairid)) goto invalid;
recursive_pop(p.list, ID2SYM(recursive_key), 0); if (!recursive_pop(p.list, ID2SYM(recursive_key), 0)) goto invalid;
if (state) JUMP_TAG(state); if (state) JUMP_TAG(state);
if (result == p.list) { if (result == p.list) {
result = (*func)(obj, arg, TRUE); result = (*func)(obj, arg, TRUE);
@ -4888,7 +4886,12 @@ exec_recursive(VALUE (*func) (VALUE, VALUE, int), VALUE obj, VALUE pairid, VALUE
result = (*func)(obj, arg, FALSE); result = (*func)(obj, arg, FALSE);
} }
POP_TAG(); POP_TAG();
recursive_pop(p.list, p.objid, p.pairid); if (!recursive_pop(p.list, p.objid, p.pairid)) {
invalid:
rb_raise(rb_eTypeError, "invalid inspect_tbl pair_list "
"for %+"PRIsVALUE" in %+"PRIsVALUE,
sym, rb_thread_current());
}
if (state) JUMP_TAG(state); if (state) JUMP_TAG(state);
} }
} }