kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* parse.y (yylex, reswords): modifier token is no longer returned in

Browse source 
fname state.  [ruby-dev:28775]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10349 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2006-06-20 16:41:08 +00:00
parent 1e5a8a56f0
commit dd69e5b006
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Jun 21 01:40:25 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (yylex, reswords): modifier token is no longer returned in
fname state. [ruby-dev:28775]
Wed Jun 21 01:12:46 2006 Kouhei Sutou <kou@cozmixng.org> Wed Jun 21 01:12:46 2006 Kouhei Sutou <kou@cozmixng.org>
* lib/rss/rss.rb: RSS::Element.def_corresponded_attr_writer * lib/rss/rss.rb: RSS::Element.def_corresponded_attr_writer

5
parse.y
View file

@ -964,11 +964,11 @@ op : '|' { $$ = '|'; }
reswords : k__LINE__ | k__FILE__ | klBEGIN | klEND reswords : k__LINE__ | k__FILE__ | klBEGIN | klEND
| kALIAS | kAND | kBEGIN | kBREAK | kCASE | kCLASS | kDEF | kALIAS | kAND | kBEGIN | kBREAK | kCASE | kCLASS | kDEF
| kDEFINED | kDO | kDO_BLOCK | kELSE | kELSIF | kEND | kENSURE | kFALSE | kDEFINED | kDO | kELSE | kELSIF | kEND | kENSURE | kFALSE
| kFOR | kIN | kMODULE | kNEXT | kNIL | kNOT | kFOR | kIN | kMODULE | kNEXT | kNIL | kNOT
| kOR | kREDO | kRESCUE | kRETRY | kRETURN | kSELF | kSUPER | kOR | kREDO | kRESCUE | kRETRY | kRETURN | kSELF | kSUPER
| kTHEN | kTRUE | kUNDEF | kWHEN | kYIELD | kTHEN | kTRUE | kUNDEF | kWHEN | kYIELD
| kIF_MOD | kUNLESS_MOD | kWHILE_MOD | kUNTIL_MOD | kRESCUE_MOD | kIF | kUNLESS | kWHILE | kUNTIL
; ;
arg : lhs '=' arg arg : lhs '=' arg
@ -4448,6 +4448,7 @@ yylex()
lex_state = kw->state; lex_state = kw->state;
if (state == EXPR_FNAME) { if (state == EXPR_FNAME) {
yylval.id = rb_intern(kw->name); yylval.id = rb_intern(kw->name);
return kw->id[0];
} }
if (kw->id[0] == kDO) { if (kw->id[0] == kDO) {
if (COND_P()) return kDO_COND; if (COND_P()) return kDO_COND;