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

tLABEL should not come after conditional ternary; fix #3344

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2016-12-13 23:44:10 +09:00
parent df35076602
commit fead715cef
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-compiler/core/parse.y
+8 -4
View File
@@ -3923,6 +3923,7 @@ parse_string(parser_state *p)
int beg = (intptr_t)p->lex_strterm->cdr->cdr->car;
int end = (intptr_t)p->lex_strterm->cdr->cdr->cdr;
parser_heredoc_info *hinf = (type & STR_FUNC_HEREDOC) ? parsing_heredoc_inf(p) : NULL;
int cmd_state = p->cmd_start;
if (beg == 0) beg = -3; /* should never happen */
if (end == 0) end = -3;
@@ -4127,10 +4128,13 @@ parse_string(parser_state *p)
return tREGEXP;
}
yylval.nd = new_str(p, tok(p), toklen(p));
if (IS_LABEL_SUFFIX(0)) {
p->lstate = EXPR_BEG;
nextc(p);
return tLABEL_END;
if (IS_LABEL_POSSIBLE()) {
if (IS_LABEL_SUFFIX(0)) {
fprintf(stderr, "tLABEL_END: %d->%d\n", p->lstate, EXPR_BEG);
p->lstate = EXPR_BEG;
nextc(p);
return tLABEL_END;
}
}
return tSTRING;