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

handle CR before LF; close #1781

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2014-04-02 03:22:06 +09:00
parent 3b339ed47f
commit 911764e8e2
1 changed files with 19 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/parse.y
+19 -27
View File
@@ -3327,6 +3327,7 @@ backref_error(parser_state *p, node *n)
}
}
static void pushback(parser_state *p, int c);
static mrb_bool peeks(parser_state *p, const char *s);
static mrb_bool skips(parser_state *p, const char *s);
@@ -3360,6 +3361,14 @@ nextc(parser_state *p)
}
}
p->column++;
if (c == '\r') {
c = nextc(p);
if (c != '\n') {
pushback(p, c);
return '\r';
}
return c;
}
return c;
eof:
@@ -3814,45 +3823,28 @@ parse_string(parser_state *p)
if (c == end || c == beg) {
tokadd(p, c);
}
else if ((c == '\n') && (type & STR_FUNC_ARRAY)) {
else if (c == '\n') {
p->lineno++;
p->column = 0;
tokadd(p, '\n');
if (type & STR_FUNC_ARRAY) {
tokadd(p, '\n');
}
}
else {
if (type & STR_FUNC_REGEXP) {
if (c == 'u') {
pushback(p, c);
tokadd(p, read_escape(p));
}
else {
tokadd(p, '\\');
if (c >= 0)
tokadd(p, c);
}
}
else {
pushback(p, c);
tokadd(p, read_escape(p));
}
pushback(p, c);
tokadd(p, read_escape(p));
if (hinf)
hinf->line_head = FALSE;
}
}
else {
if (c != beg && c != end) {
switch (c) {
case '\n':
if (c == '\n') {
p->lineno++;
p->column = 0;
break;
case '\\':
break;
default:
if (! ISSPACE(c))
tokadd(p, '\\');
}
if (!(c == '\\' || ((type & STR_FUNC_ARRAY) && ISSPACE(c)))) {
tokadd(p, '\\');
}
}
tokadd(p, c);