admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

EXPR_BEG by keywords is a start point of commands; backport r35457 from CRuby

Browse Source
This commit is contained in:
Yukihiro Matsumoto
2012-04-24 18:25:26 +09:00
parent 8b367098ac
commit f9339f5c67
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/parse.y
+9 -1
View File
@@ -2581,6 +2581,7 @@ superclass : term
| '<'
{
p->lstate = EXPR_BEG;
p->cmd_start = TRUE;
}
expr_value term
{
@@ -3346,8 +3347,9 @@ parse_string(parser_state *p, int term)
c = nextc(p);
if (c == '{') {
tokfix(p);
p->lstate = EXPR_END;
p->lstate = EXPR_BEG;
p->sterm = term;
p->cmd_start = TRUE;
yylval.node = new_str(p, tok(p), toklen(p));
return tSTRING_PART;
}
@@ -3477,6 +3479,7 @@ parser_yylex(parser_state *p)
}
}
normal_newline:
p->cmd_start = TRUE;
p->lstate = EXPR_BEG;
return '\n';
@@ -3582,6 +3585,8 @@ parser_yylex(parser_state *p)
switch (p->lstate) {
case EXPR_FNAME: case EXPR_DOT:
p->lstate = EXPR_ARG; break;
case EXPR_CLASS:
p->cmd_start = TRUE;
default:
p->lstate = EXPR_BEG; break;
}
@@ -4536,6 +4541,9 @@ parser_yylex(parser_state *p)
yylval.id = intern(kw->name);
return kw->id[0];
}
if (p->lstate == EXPR_BEG) {
p->cmd_start = TRUE;
}
if (kw->id[0] == keyword_do) {
if (p->lpar_beg && p->lpar_beg == p->paren_nest) {
p->lpar_beg = 0;