diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-02-02 11:38:20 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-02-02 11:38:20 +0000 |
| commit | 765255b737235a65daea6679c4672541bb67ecb4 (patch) | |
| tree | 5ea517fae24a858cd204bbbe20e6d695c6472eae /parse.y | |
| parent | e9f9915a4c305ac02d8634b14579119433bc7b43 (diff) | |
* array.c (rb_ary_sort_bang): returns self, even if its length is
less than 2.
* eval.c (POP_VARS): propagate DVAR_DONT_RECYCLE, if
SCOPE_DONT_RECYCLE of ruby_scope is set.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1156 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
| -rw-r--r-- | parse.y | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -3392,8 +3392,7 @@ yylex() return c; case '{': - if (lex_state != EXPR_END && - lex_state != EXPR_ARG) + if (lex_state != EXPR_END && lex_state != EXPR_ARG) c = tLBRACE; lex_state = EXPR_BEG; return c; @@ -4694,7 +4693,7 @@ top_local_setup() i = ruby_scope->local_tbl?ruby_scope->local_tbl[0]:0; if (i < len) { - if (i == 0 || (ruby_scope->flag & SCOPE_MALLOC) == 0) { + if (i == 0 || (ruby_scope->flags & SCOPE_MALLOC) == 0) { VALUE *vars = ALLOC_N(VALUE, len+1); if (ruby_scope->local_vars) { *vars++ = ruby_scope->local_vars[-1]; @@ -4706,7 +4705,7 @@ top_local_setup() rb_mem_clear(vars, len); } ruby_scope->local_vars = vars; - ruby_scope->flag |= SCOPE_MALLOC; + ruby_scope->flags |= SCOPE_MALLOC; } else { VALUE *vars = ruby_scope->local_vars-1; |