diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-11 04:20:27 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-11 04:20:27 +0000 |
commit | aa473577fe647eda0cc044dc1e854d269a4c63d2 (patch) | |
tree | f5de2cca6712e8db666d71b4a3973ef8faa78471 /insns.def | |
parent | 6670aee9793b2fb57ecfe0c89111bc08bed79d14 (diff) |
merges r28123 from trunk into ruby_1_9_2.
--
* compile.c (iseq_compile_each): should consider block on stack,
if block argument is passed. [ruby-core:30534]
* parse.c (arg_concat_gen): should append to nd_head, not to
nd_iter for NODE_BLOCK_PASS.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28270 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'insns.def')
-rw-r--r-- | insns.def | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -498,6 +498,7 @@ concatarray (VALUE ary1, VALUE ary2st) (VALUE ary) { + const VALUE *sp = GET_SP(); const VALUE ary2 = ary2st; VALUE tmp1 = rb_check_convert_type(ary1, T_ARRAY, "Array", "to_a"); VALUE tmp2 = rb_check_convert_type(ary2, T_ARRAY, "Array", "to_a"); |