diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | parse.y | 5 |
2 files changed, 9 insertions, 3 deletions
@@ -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> * lib/rss/rss.rb: RSS::Element.def_corresponded_attr_writer @@ -300,7 +305,7 @@ Sat Jun 17 09:03:47 2006 Kouhei Sutou <kou@cozmixng.org> * lib/rss/maker/taxonomy.rb: implemented taxonomy module for RSS Maker. * lib/rss/taxonomy.rb: supported RSS Maker. - * lib/rss/maker.rb: added taxonomy module support. + * lib/rss/maker.rb: added taxonomy module support. * lib/rss/rss.rb: adjusted to other element API. * lib/rss/1.0.rb: adjusted to other element API but backward @@ -964,11 +964,11 @@ op : '|' { $$ = '|'; } reswords : k__LINE__ | k__FILE__ | klBEGIN | klEND | 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 | kOR | kREDO | kRESCUE | kRETRY | kRETURN | kSELF | kSUPER | kTHEN | kTRUE | kUNDEF | kWHEN | kYIELD - | kIF_MOD | kUNLESS_MOD | kWHILE_MOD | kUNTIL_MOD | kRESCUE_MOD + | kIF | kUNLESS | kWHILE | kUNTIL ; arg : lhs '=' arg @@ -4448,6 +4448,7 @@ yylex() lex_state = kw->state; if (state == EXPR_FNAME) { yylval.id = rb_intern(kw->name); + return kw->id[0]; } if (kw->id[0] == kDO) { if (COND_P()) return kDO_COND; |