Commit 7c9a1acc authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto

remove conflict

parents 6cf42a82 650ffb9d
......@@ -3545,28 +3545,28 @@ read_escape(parser_state *p)
int c;
switch (c = nextc(p)) {
case '\\': /* Backslash */
case '\\':/* Backslash */
return c;
case 'n': /* newline */
case 'n':/* newline */
return '\n';
case 't': /* horizontal tab */
case 't':/* horizontal tab */
return '\t';
case 'r': /* carriage-return */
case 'r':/* carriage-return */
return '\r';
case 'f': /* form-feed */
case 'f':/* form-feed */
return '\f';
case 'v': /* vertical tab */
case 'v':/* vertical tab */
return '\13';
case 'a': /* alarm(bell) */
case 'a':/* alarm(bell) */
return '\007';
case 'e': /* escape */
case 'e':/* escape */
return 033;
case '0': case '1': case '2': case '3': /* octal constant */
......@@ -3609,10 +3609,10 @@ read_escape(parser_state *p)
}
return c;
case 'b': /* backspace */
case 'b':/* backspace */
return '\010';
case 's': /* space */
case 's':/* space */
return ' ';
case 'M':
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment