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

Fix line number bug; fix #4513

Browse Source 
Also fix the misfeature introduced in 23783a4, that ignores newlines
between method chains.
This commit is contained in:
Yukihiro "Matz" Matsumoto
2019-07-27 14:49:57 +09:00
parent 42fb251d0a
commit b58f769c96
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-compiler/core/parse.y
+3 -5
View File
@@ -4731,6 +4731,7 @@ parser_yylex(parser_state *p)
case '\n':
maybe_heredoc:
heredoc_treat_nextline(p);
p->column = 0;
switch (p->lstate) {
case EXPR_BEG:
case EXPR_FNAME:
@@ -4738,7 +4739,6 @@ parser_yylex(parser_state *p)
case EXPR_CLASS:
case EXPR_VALUE:
p->lineno++;
p->column = 0;
if (p->parsing_heredoc != NULL) {
if (p->lex_strterm) {
return parse_string(p);
@@ -4759,15 +4759,12 @@ parser_yylex(parser_state *p)
break;
case '#': /* comment as a whitespace */
pushback(p, '#');
goto retry;
case '\n': /* consecutive newlines */
p->lineno++;
p->column = 0;
pushback(p, '\n');
goto retry;
case '.':
if (!peek(p, '.')) {
pushback(p, '.');
p->lineno++;
goto retry;
}
pushback(p, c);
@@ -4775,6 +4772,7 @@ parser_yylex(parser_state *p)
case '&':
if (peek(p, '.')) {
pushback(p, '&');
p->lineno++;
goto retry;
}
pushback(p, c);