1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed unused argument

Browse Source 
Eventually, `read_escape` does not use `encp`.
This commit is contained in:
Nobuyoshi Nakada 2017-07-15 16:18:18 +09:00
parent f26d53e905
commit 2f8a719b6a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
parse.y
View File

@ -7965,7 +7965,7 @@ tokadd_utf8(struct parser_params *p, rb_encoding **encp,
#define ESCAPE_META 2 #define ESCAPE_META 2
static int static int
read_escape(struct parser_params *p, int flags, rb_encoding **encp) read_escape(struct parser_params *p, int flags)
{ {
int c; int c;
size_t numlen; size_t numlen;
@ -8024,7 +8024,7 @@ read_escape(struct parser_params *p, int flags, rb_encoding **encp)
nextc(p); nextc(p);
goto eof; goto eof;
} }
return read_escape(p, flags|ESCAPE_META, encp) | 0x80; return read_escape(p, flags|ESCAPE_META) | 0x80;
} }
else if (c == -1 || !ISASCII(c)) goto eof; else if (c == -1 || !ISASCII(c)) goto eof;
else { else {
@ -8053,7 +8053,7 @@ read_escape(struct parser_params *p, int flags, rb_encoding **encp)
nextc(p); nextc(p);
goto eof; goto eof;
} }
c = read_escape(p, flags|ESCAPE_CONTROL, encp); c = read_escape(p, flags|ESCAPE_CONTROL);
} }
else if (c == '?') else if (c == '?')
return 0177; return 0177;
@ -8101,7 +8101,7 @@ tokaddmbc(struct parser_params *p, int c, rb_encoding *enc)
} }
static int static int
tokadd_escape(struct parser_params *p, rb_encoding **encp) tokadd_escape(struct parser_params *p)
{ {
int c; int c;
size_t numlen; size_t numlen;
@ -8341,7 +8341,7 @@ tokadd_string(struct parser_params *p,
case 'C': case 'C':
case 'M': { case 'M': {
pushback(p, c); pushback(p, c);
c = read_escape(p, 0, enc); c = read_escape(p, 0);
char *t = tokspace(p, rb_strlen_lit("\\x00")); char *t = tokspace(p, rb_strlen_lit("\\x00"));
*t++ = '\\'; *t++ = '\\';
@ -8357,7 +8357,7 @@ tokadd_string(struct parser_params *p,
continue; continue;
} }
pushback(p, c); pushback(p, c);
if ((c = tokadd_escape(p, enc)) < 0) if ((c = tokadd_escape(p)) < 0)
return -1; return -1;
if (*enc && *enc != *encp) { if (*enc && *enc != *encp) {
mixed_escape(p->lex.ptok+2, *enc, *encp); mixed_escape(p->lex.ptok+2, *enc, *encp);
@ -8367,7 +8367,7 @@ tokadd_string(struct parser_params *p,
else if (func & STR_FUNC_EXPAND) { else if (func & STR_FUNC_EXPAND) {
pushback(p, c); pushback(p, c);
if (func & STR_FUNC_ESCAPE) tokadd(p, '\\'); if (func & STR_FUNC_ESCAPE) tokadd(p, '\\');
c = read_escape(p, 0, enc); c = read_escape(p, 0);
} }
else if ((func & STR_FUNC_QWORDS) && ISSPACE(c)) { else if ((func & STR_FUNC_QWORDS) && ISSPACE(c)) {
/* ignore backslashed spaces in %w */ /* ignore backslashed spaces in %w */
@ -9908,7 +9908,7 @@ parse_qmark(struct parser_params *p, int space_seen)
if (tokadd_mbchar(p, c) == -1) return 0; if (tokadd_mbchar(p, c) == -1) return 0;
} }
else { else {
c = read_escape(p, 0, &enc); c = read_escape(p, 0);
tokadd(p, c); tokadd(p, c);
} }
} }