diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-05-01 08:57:59 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-05-01 08:57:59 +0000 |
| commit | 9e48aed6e16943631e58d335e2e24aba578743e3 (patch) | |
| tree | e9242826b772b8d5d3e7a91136a3d9b5550c7ab9 | |
| parent | 37f84274a23797009f4e248e02f40a9adccf1773 (diff) | |
* parse.y (yylex): lex_state after RESCUE_MOD should be EXPR_BEG.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@1354 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | parse.y | 8 |
2 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Tue May 1 17:55:58 2001 Yukihiro Matsumoto <[email protected]> + + * parse.y (yylex): lex_state after RESCUE_MOD should be EXPR_BEG. + Tue May 1 03:36:50 2001 Akinori MUSHA <[email protected]> * sample/irb.rb, lib/irb.rb, lib/irb/*, doc/irb/*: Merge from irb @@ -3624,7 +3624,13 @@ yylex() if (CMDARG_P()) return kDO_BLOCK; return kDO; } - return kw->id[state != EXPR_BEG]; + if (state == EXPR_BEG) + return kw->id[0]; + else { + if (kw->id[0] != kw->id[1]) + lex_state = EXPR_BEG; + return kw->id[1]; + } } } |