diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-02-26 04:07:52 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-02-26 04:07:52 +0000 |
commit | 8dd4317ebdbd0171ce89e0c710a279e91231d06b (patch) | |
tree | 821f5a8d452e89830d80e4ede63b9e3fa380832e /parse.y | |
parent | f9a0d2429ff00b809c8cfd1a43674bad08685c4e (diff) |
* eval.c (proc_call): should not modify ruby_block->frame.iter
based on ruby_frame->iter altered by PUSH_ITER().
* eval.c (rb_thread_fd_close): should save current context before
raising exception.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@1218 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r-- | parse.y | 15 |
1 files changed, 8 insertions, 7 deletions
@@ -1271,7 +1271,12 @@ primary : literal cref_pop(); class_nest--; } - | kCLASS tLSHFT expr term + | kCLASS tLSHFT expr + { + $<num>$ = in_def; + in_def = 0; + } + term { $<num>$ = in_single; in_single = 0; @@ -1279,10 +1284,6 @@ primary : literal cref_push(); local_push(); } - { - $<num>$ = in_def; - in_def = 0; - } compstmt kEND { @@ -1291,8 +1292,8 @@ primary : literal local_pop(); cref_pop(); class_nest--; - in_single = $<num>5; - in_def = $<num>6; + in_def = $<num>4; + in_single = $<num>6; } | kMODULE cname { |