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): operators in the "op" rule should make

Browse source 
lex_state EXPR_ARG on EXPR_FNAME and EXPR_DOT.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2090 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2002-02-19 05:39:06 +00:00
parent d1ca5e6d6a
commit 87bf8b1dc3
2 changed files with 92 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Feb 19 14:24:36 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
* parse.y (yylex): operators in the "op" rule should make
lex_state EXPR_ARG on EXPR_FNAME and EXPR_DOT.
Tue Feb 19 13:38:10 2002 Yukihiro Matsumoto <matz@ruby-lang.org> Tue Feb 19 13:38:10 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_eval_string_wrap): should hide the toplevel local * eval.c (rb_eval_string_wrap): should hide the toplevel local

114
parse.y
View file

@ -3004,31 +3004,38 @@ yylex()
case '*': case '*':
if ((c = nextc()) == '*') { if ((c = nextc()) == '*') {
lex_state = EXPR_BEG;
if (nextc() == '=') { if (nextc() == '=') {
lex_state = EXPR_BEG;
yylval.id = tPOW; yylval.id = tPOW;
return tOP_ASGN; return tOP_ASGN;
} }
pushback(c); pushback(c);
return tPOW; c = tPOW;
}
if (c == '=') {
yylval.id = '*';
lex_state = EXPR_BEG;
return tOP_ASGN;
}
pushback(c);
if (IS_ARG() && space_seen && !ISSPACE(c)){
rb_warning("`*' interpreted as argument prefix");
c = tSTAR;
}
else if (lex_state == EXPR_BEG || lex_state == EXPR_MID) {
c = tSTAR;
} }
else { else {
c = '*'; if (c == '=') {
yylval.id = '*';
lex_state = EXPR_BEG;
return tOP_ASGN;
}
pushback(c);
if (IS_ARG() && space_seen && !ISSPACE(c)){
rb_warning("`*' interpreted as argument prefix");
c = tSTAR;
}
else if (lex_state == EXPR_BEG || lex_state == EXPR_MID) {
c = tSTAR;
}
else {
c = '*';
}
}
switch (lex_state) {
case EXPR_FNAME: case EXPR_DOT:
lex_state = EXPR_ARG; break;
default:
lex_state = EXPR_BEG; break;
} }
lex_state = EXPR_BEG;
return c; return c;
case '!': case '!':
@ -3064,7 +3071,12 @@ yylex()
} }
} }
lex_state = EXPR_BEG; switch (lex_state) {
case EXPR_FNAME: case EXPR_DOT:
lex_state = EXPR_ARG; break;
default:
lex_state = EXPR_BEG; break;
}
if ((c = nextc()) == '=') { if ((c = nextc()) == '=') {
if ((c = nextc()) == '=') { if ((c = nextc()) == '=') {
return tEQQ; return tEQQ;
@ -3099,7 +3111,12 @@ yylex()
} }
pushback(c2); pushback(c2);
} }
lex_state = EXPR_BEG; switch (lex_state) {
case EXPR_FNAME: case EXPR_DOT:
lex_state = EXPR_ARG; break;
default:
lex_state = EXPR_BEG; break;
}
if (c == '=') { if (c == '=') {
if ((c = nextc()) == '>') { if ((c = nextc()) == '>') {
return tCMP; return tCMP;
@ -3109,6 +3126,7 @@ yylex()
} }
if (c == '<') { if (c == '<') {
if (nextc() == '=') { if (nextc() == '=') {
lex_state = EXPR_BEG;
yylval.id = tLSHFT; yylval.id = tLSHFT;
return tOP_ASGN; return tOP_ASGN;
} }
@ -3119,12 +3137,18 @@ yylex()
return '<'; return '<';
case '>': case '>':
lex_state = EXPR_BEG; switch (lex_state) {
case EXPR_FNAME: case EXPR_DOT:
lex_state = EXPR_ARG; break;
default:
lex_state = EXPR_BEG; break;
}
if ((c = nextc()) == '=') { if ((c = nextc()) == '=') {
return tGEQ; return tGEQ;
} }
if (c == '>') { if (c == '>') {
if ((c = nextc()) == '=') { if ((c = nextc()) == '=') {
lex_state = EXPR_BEG;
yylval.id = tRSHFT; yylval.id = tRSHFT;
return tOP_ASGN; return tOP_ASGN;
} }
@ -3193,12 +3217,17 @@ yylex()
else { else {
c = '&'; c = '&';
} }
lex_state = EXPR_BEG; switch (lex_state) {
case EXPR_FNAME: case EXPR_DOT:
lex_state = EXPR_ARG; break;
default:
lex_state = EXPR_BEG;
}
return c; return c;
case '|': case '|':
lex_state = EXPR_BEG;
if ((c = nextc()) == '|') { if ((c = nextc()) == '|') {
lex_state = EXPR_BEG;
if ((c = nextc()) == '=') { if ((c = nextc()) == '=') {
yylval.id = tOROP; yylval.id = tOROP;
return tOP_ASGN; return tOP_ASGN;
@ -3206,16 +3235,24 @@ yylex()
pushback(c); pushback(c);
return tOROP; return tOROP;
} }
else if (c == '=') { if (c == '=') {
lex_state = EXPR_BEG;
yylval.id = '|'; yylval.id = '|';
return tOP_ASGN; return tOP_ASGN;
} }
if (lex_state == EXPR_FNAME || lex_state == EXPR_DOT) {
lex_state = EXPR_ARG;
}
else {
lex_state = EXPR_BEG;
}
pushback(c); pushback(c);
return '|'; return '|';
case '+': case '+':
c = nextc(); c = nextc();
if (lex_state == EXPR_FNAME || lex_state == EXPR_DOT) { if (lex_state == EXPR_FNAME || lex_state == EXPR_DOT) {
lex_state = EXPR_ARG;
if (c == '@') { if (c == '@') {
return tUPLUS; return tUPLUS;
} }
@ -3245,6 +3282,7 @@ yylex()
case '-': case '-':
c = nextc(); c = nextc();
if (lex_state == EXPR_FNAME || lex_state == EXPR_DOT) { if (lex_state == EXPR_FNAME || lex_state == EXPR_DOT) {
lex_state = EXPR_ARG;
if (c == '@') { if (c == '@') {
return tUMINUS; return tUMINUS;
} }
@ -3509,15 +3547,26 @@ yylex()
return parse_regx('/', '/'); return parse_regx('/', '/');
} }
} }
lex_state = EXPR_BEG; switch (lex_state) {
case EXPR_FNAME: case EXPR_DOT:
lex_state = EXPR_ARG; break;
default:
lex_state = EXPR_BEG; break;
}
return '/'; return '/';
case '^': case '^':
lex_state = EXPR_BEG;
if ((c = nextc()) == '=') { if ((c = nextc()) == '=') {
lex_state = EXPR_BEG;
yylval.id = '^'; yylval.id = '^';
return tOP_ASGN; return tOP_ASGN;
} }
switch (lex_state) {
case EXPR_FNAME: case EXPR_DOT:
lex_state = EXPR_ARG; break;
default:
lex_state = EXPR_BEG; break;
}
pushback(c); pushback(c);
return '^'; return '^';
@ -3533,7 +3582,12 @@ yylex()
pushback(c); pushback(c);
} }
} }
lex_state = EXPR_BEG; switch (lex_state) {
case EXPR_FNAME: case EXPR_DOT:
lex_state = EXPR_ARG; break;
default:
lex_state = EXPR_BEG; break;
}
return '~'; return '~';
case '(': case '(':
@ -3557,6 +3611,7 @@ yylex()
case '[': case '[':
if (lex_state == EXPR_FNAME || lex_state == EXPR_DOT) { if (lex_state == EXPR_FNAME || lex_state == EXPR_DOT) {
lex_state = EXPR_ARG;
if ((c = nextc()) == ']') { if ((c = nextc()) == ']') {
if ((c = nextc()) == '=') { if ((c = nextc()) == '=') {
return tASET; return tASET;
@ -3656,7 +3711,12 @@ yylex()
if (IS_ARG() && space_seen && !ISSPACE(c)) { if (IS_ARG() && space_seen && !ISSPACE(c)) {
goto quotation; goto quotation;
} }
lex_state = EXPR_BEG; switch (lex_state) {
case EXPR_FNAME: case EXPR_DOT:
lex_state = EXPR_ARG; break;
default:
lex_state = EXPR_BEG; break;
}
pushback(c); pushback(c);
return '%'; return '%';