From 7b484902220ded077a37a3a2e4587df2fe27f5e0 Mon Sep 17 00:00:00 2001 From: matz Date: Sat, 17 Jun 2006 14:50:04 +0000 Subject: * eval.c (Init_eval): add aliases invoke_method and invoke_functional_method corresponding send and funcall respectively. [ruby-talk:197512] * parse.y (parser_yylex): returns the most typical keyword token on EXPR_FNAME. [ruby-core:7995] * ext/socket/socket.c: protoize. * parse.y (then): remove ':' from 'then' and 'do' rules. * hash.c (env_aset): raise TypeError on nil with more descriptive message. [ruby-core:07990] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10304 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- parse.y | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'parse.y') diff --git a/parse.y b/parse.y index f78eba5d40..c542b35b75 100644 --- a/parse.y +++ b/parse.y @@ -1651,7 +1651,7 @@ op : '|' { ifndef_ripper($$ = '|'); } 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 @@ -2834,11 +2834,6 @@ then : term /*%c { $$ = Qnil; } %*/ - | ':' - /*%c%*/ - /*%c - { $$ = Qnil; } - %*/ | kTHEN | term kTHEN /*%c%*/ @@ -2852,11 +2847,6 @@ do : term /*%c { $$ = Qnil; } %*/ - | ':' - /*%c%*/ - /*%c - { $$ = Qnil; } - %*/ | kDO_COND ; @@ -6727,6 +6717,7 @@ parser_yylex(struct parser_params *parser) lex_state = kw->state; if (state == EXPR_FNAME) { set_yylval_id(rb_intern(kw->name)); + return kw->id[0]; } if (kw->id[0] == kDO) { if (lpar_beg && lpar_beg == paren_nest) { -- cgit v1.2.3