1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* parse.y (primary): also in ripper, saves in_def before restoring.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20781 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-12-16 07:29:47 +00:00
parent 4bf5646e64
commit b315664f2b
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Tue Dec 16 16:29:45 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (primary): also in ripper, saves in_def before restoring.
Tue Dec 16 12:30:56 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Dec 16 12:30:56 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (ac_cv_header_ucontext_h): do not use ucontext.h on Mac * configure.in (ac_cv_header_ucontext_h): do not use ucontext.h on Mac

21
parse.y
View File

@ -2828,22 +2828,16 @@ primary : literal
} }
| k_class tLSHFT expr | k_class tLSHFT expr
{ {
/*%%%*/
$<num>$ = in_def; $<num>$ = in_def;
in_def = 0; in_def = 0;
/*%
in_def = 0;
%*/
} }
term term
{ {
/*%%%*/
$<num>$ = in_single; $<num>$ = in_single;
in_single = 0; in_single = 0;
/*%%%*/
local_push(0); local_push(0);
/*% /*%
$$ = in_single;
in_single = 0;
%*/ %*/
} }
bodystmt bodystmt
@ -2853,13 +2847,11 @@ primary : literal
$$ = NEW_SCLASS($3, $7); $$ = NEW_SCLASS($3, $7);
fixpos($$, $3); fixpos($$, $3);
local_pop(); local_pop();
in_def = $<num>4;
in_single = $<num>6;
/*% /*%
$$ = dispatch2(sclass, $3, $7); $$ = dispatch2(sclass, $3, $7);
in_def = $<val>4;
in_single = $<val>6;
%*/ %*/
in_def = $<num>4;
in_single = $<num>6;
} }
| k_module cpath | k_module cpath
{ {
@ -2903,13 +2895,11 @@ primary : literal
fixpos($$, $4); fixpos($$, $4);
fixpos($$->nd_defn, $4); fixpos($$->nd_defn, $4);
local_pop(); local_pop();
in_def--;
cur_mid = $<id>3;
/*% /*%
$$ = dispatch3(def, $2, $4, $5); $$ = dispatch3(def, $2, $4, $5);
%*/
in_def--; in_def--;
cur_mid = $<id>3; cur_mid = $<id>3;
%*/
} }
| k_def singleton dot_or_colon {lex_state = EXPR_FNAME;} fname | k_def singleton dot_or_colon {lex_state = EXPR_FNAME;} fname
{ {
@ -2931,11 +2921,10 @@ primary : literal
fixpos($$, $2); fixpos($$, $2);
fixpos($$->nd_defn, $2); fixpos($$->nd_defn, $2);
local_pop(); local_pop();
in_single--;
/*% /*%
$$ = dispatch5(defs, $2, $3, $5, $7, $8); $$ = dispatch5(defs, $2, $3, $5, $7, $8);
in_single--;
%*/ %*/
in_single--;
} }
| keyword_break | keyword_break
{ {