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

bugfix about escaping '\n'

Browse Source
This commit is contained in:
FUKUZAWA-Tadashi
2013-03-17 21:22:21 +09:00
committed by Masaki Muranaka
parent e5a66685b0
commit 801bc9e39e
2 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/parse.y
+19 -7
View File
@@ -3535,7 +3535,7 @@ parse_string(parser_state *p)
char buf[256];
snprintf(buf, sizeof(buf), "can't find string \"%s\" anywhere before EOF", hinf->term);
yyerror(p, buf);
return 0;
return 0;
}
yylval.nd = new_str(p, tok(p), toklen(p));
return tSTRING_MID;
@@ -3558,6 +3558,11 @@ parse_string(parser_state *p)
if (c == end || c == beg) {
tokadd(p, c);
}
else if ((c == '\n') && (type & STR_FUNC_ARRAY)) {
p->lineno++;
p->column = 0;
tokadd(p, '\n');
}
else {
pushback(p, c);
tokadd(p, read_escape(p));
@@ -3570,14 +3575,14 @@ parse_string(parser_state *p)
case '\n':
p->lineno++;
p->column = 0;
continue;
break;
case '\\':
c = '\\';
break;
default:
tokadd(p, '\\');
if (! ISSPACE(c))
tokadd(p, '\\');
}
}
tokadd(p, c);
@@ -3601,7 +3606,12 @@ parse_string(parser_state *p)
}
if ((type & STR_FUNC_ARRAY) && ISSPACE(c)) {
if (toklen(p) == 0) {
do {} while (ISSPACE(c = nextc(p)));
do {
if (c == '\n') {
p->lineno++;
p->column = 0;
}
} while (ISSPACE(c = nextc(p)));
pushback(p, c);
return tLITERAL_DELIM;
} else {
@@ -3681,8 +3691,10 @@ heredoc_identifier(parser_state *p)
quote = TRUE;
newtok(p);
while ((c = nextc(p)) != -1 && c != term) {
if (c == '\n')
c = -1;
if (c == '\n') {
c = -1;
break;
}
tokadd(p, c);
}
if (c == -1) {