mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* string.c (rb_str_inspect): escape # which starts an expression
substitution. fixed: [ruby-core:03922] * string.c (rb_str_dump): not escape # which isn't a substitution. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7519 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
b9c6120e07
commit
e326946b35
2 changed files with 16 additions and 3 deletions
|
@ -1,3 +1,10 @@
|
|||
Thu Dec 9 14:38:35 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* string.c (rb_str_inspect): escape # which starts an expression
|
||||
substitution. fixed: [ruby-core:03922]
|
||||
|
||||
* string.c (rb_str_dump): not escape # which isn't a substitution.
|
||||
|
||||
Thu Dec 9 12:31:53 2004 WATANABE Hirofumi <eban@ruby-lang.org>
|
||||
|
||||
* io.c (pipe_open): should set prog if argc != 0.
|
||||
|
|
12
string.c
12
string.c
|
@ -2570,6 +2570,8 @@ rb_str_to_s(str)
|
|||
return str;
|
||||
}
|
||||
|
||||
#define IS_EVSTR(p,e) ((p) < (e) && (*(p) == '$' || *(p) == '@' || *(p) == '{'))
|
||||
|
||||
/*
|
||||
* call-seq:
|
||||
* str.inspect => string
|
||||
|
@ -2598,7 +2600,7 @@ rb_str_inspect(str)
|
|||
rb_str_buf_cat(result, p - 1, len);
|
||||
p += len - 1;
|
||||
}
|
||||
else if (c == '"'|| c == '\\') {
|
||||
else if (c == '"'|| c == '\\' || (c == '#' && IS_EVSTR(p, pend))) {
|
||||
s[0] = '\\'; s[1] = c;
|
||||
rb_str_buf_cat(result, s, 2);
|
||||
}
|
||||
|
@ -2670,11 +2672,15 @@ rb_str_dump(str)
|
|||
switch (c) {
|
||||
case '"': case '\\':
|
||||
case '\n': case '\r':
|
||||
case '\t': case '\f': case '#':
|
||||
case '\t': case '\f':
|
||||
case '\013': case '\007': case '\033':
|
||||
len += 2;
|
||||
break;
|
||||
|
||||
case '#':
|
||||
len += IS_EVSTR(p, pend) ? 2 : 1;
|
||||
break;
|
||||
|
||||
default:
|
||||
if (ISPRINT(c)) {
|
||||
len++;
|
||||
|
@ -2699,7 +2705,7 @@ rb_str_dump(str)
|
|||
*q++ = c;
|
||||
}
|
||||
else if (c == '#') {
|
||||
*q++ = '\\';
|
||||
if (IS_EVSTR(p, pend)) *q++ = '\\';
|
||||
*q++ = '#';
|
||||
}
|
||||
else if (ISPRINT(c)) {
|
||||
|
|
Loading…
Reference in a new issue