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

* eval.c (rb_call_super): do not use rb_block_given_p() for

Browse Source 
check. [ruby-talk:78656]

* eval.c (BEGIN_CALLARGS): push ITER_NOT only when ITER_PRE.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4365 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2003-08-11 08:35:54 +00:00
parent b2385db896
commit 5256bca931
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Mon Aug 11 17:33:07 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_call_super): do not use rb_block_given_p() for
check. [ruby-talk:78656]
* eval.c (BEGIN_CALLARGS): push ITER_NOT only when ITER_PRE.
Sun Aug 10 10:43:05 2003 GOTOU Yuuzou <gotoyuzo@notwork.org> Sun Aug 10 10:43:05 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/lib/openssl/buffering.rb: increase BLOCK_SIZE * ext/openssl/lib/openssl/buffering.rb: increase BLOCK_SIZE

8
eval.c
View File

@ -1961,10 +1961,12 @@ copy_node_scope(node, rval)
#define BEGIN_CALLARGS do {\ #define BEGIN_CALLARGS do {\
struct BLOCK *tmp_block = ruby_block;\ struct BLOCK *tmp_block = ruby_block;\
if (ruby_iter->iter == ITER_PRE) {\ int tmp_iter = ruby_iter->iter;\
if (tmp_iter == ITER_PRE) {\
ruby_block = ruby_block->outer;\ ruby_block = ruby_block->outer;\
tmp_iter = ITER_NOT;\
}\ }\
PUSH_ITER(ITER_NOT) PUSH_ITER(tmp_iter)
#define END_CALLARGS \ #define END_CALLARGS \
ruby_block = tmp_block;\ ruby_block = tmp_block;\
@ -5239,7 +5241,7 @@ rb_call_super(argc, argv)
klass = k; klass = k;
} }
PUSH_ITER(ruby_iter->iter || rb_block_given_p() ? ITER_PRE : ITER_NOT); PUSH_ITER(ruby_iter->iter ? ITER_PRE : ITER_NOT);
result = rb_call(RCLASS(klass)->super, self, ruby_frame->orig_func, argc, argv, 3); result = rb_call(RCLASS(klass)->super, self, ruby_frame->orig_func, argc, argv, 3);
POP_ITER(); POP_ITER();