ruby-changes:9289
From: yugui <ko1@a...>
Date: Wed, 17 Dec 2008 15:18:32 +0900 (JST)
Subject: [ruby-changes:9289] Ruby:r20827 (ruby_1_9_1): merges r20781 from trunk into ruby_1_9_1.
yugui 2008-12-17 15:17:51 +0900 (Wed, 17 Dec 2008) New Revision: 20827 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=20827 Log: merges r20781 from trunk into ruby_1_9_1. * parse.y (primary): also in ripper, saves in_def before restoring. Modified files: branches/ruby_1_9_1/ChangeLog branches/ruby_1_9_1/parse.y Index: ruby_1_9_1/ChangeLog =================================================================== --- ruby_1_9_1/ChangeLog (revision 20826) +++ ruby_1_9_1/ChangeLog (revision 20827) @@ -1,3 +1,7 @@ +Tue Dec 16 16:29:45 2008 Nobuyoshi Nakada <nobu@r...> + + * parse.y (primary): also in ripper, saves in_def before restoring. + Tue Dec 16 12:30:56 2008 Nobuyoshi Nakada <nobu@r...> * configure.in (ac_cv_header_ucontext_h): do not use ucontext.h on Mac Index: ruby_1_9_1/parse.y =================================================================== --- ruby_1_9_1/parse.y (revision 20826) +++ ruby_1_9_1/parse.y (revision 20827) @@ -2828,22 +2828,16 @@ } | k_class tLSHFT expr { - /*%%%*/ $<num>$ = in_def; in_def = 0; - /*% - in_def = 0; - %*/ } term { - /*%%%*/ $<num>$ = in_single; in_single = 0; + /*%%%*/ local_push(0); /*% - $$ = in_single; - in_single = 0; %*/ } bodystmt @@ -2853,13 +2847,11 @@ $$ = NEW_SCLASS($3, $7); fixpos($$, $3); local_pop(); - in_def = $<num>4; - in_single = $<num>6; /*% $$ = dispatch2(sclass, $3, $7); - in_def = $<val>4; - in_single = $<val>6; %*/ + in_def = $<num>4; + in_single = $<num>6; } | k_module cpath { @@ -2903,13 +2895,11 @@ fixpos($$, $4); fixpos($$->nd_defn, $4); local_pop(); - in_def--; - cur_mid = $<id>3; /*% $$ = dispatch3(def, $2, $4, $5); + %*/ in_def--; cur_mid = $<id>3; - %*/ } | k_def singleton dot_or_colon {lex_state = EXPR_FNAME;} fname { @@ -2931,11 +2921,10 @@ fixpos($$, $2); fixpos($$->nd_defn, $2); local_pop(); - in_single--; /*% $$ = dispatch5(defs, $2, $3, $5, $7, $8); - in_single--; %*/ + in_single--; } | keyword_break { -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/