kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* string.c (rb_str_dump): preserve the encoding of source string

Browse source 
if it is ASCII compatible.  otherwise, add '.force_encoding()'
  for ugly work around.  maybe we should implement some other way
  to keep non ASCII encoding in dumped string.  [ruby-dev:33142]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15108 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2008-01-18 04:49:14 +00:00
parent 845ae33b17
commit c58736dbdc
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -98,6 +98,13 @@ Thu Jan 17 21:01:25 2008 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date.rb, lib/date/format.rb: some trivial changes.
Thu Jan 17 13:07:18 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (rb_str_dump): preserve the encoding of source string
if it is ASCII compatible. otherwise, add '.force_encoding()'
for ugly work around. maybe we should implement some other way
to keep non ASCII encoding in dumped string. [ruby-dev:33142]
Thu Jan 17 10:30:32 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* io.c (io_fwrite): always flush IO on tty, even without newlines.

11
string.c
View file

@ -3210,6 +3210,7 @@ escape_codepoint:
VALUE
rb_str_dump(VALUE str)
{
rb_encoding *enc0 = rb_enc_get(str);
rb_encoding *enc = rb_enc_from_index(0);
long len;
char *p, *pend;
@ -3242,6 +3243,10 @@ rb_str_dump(VALUE str)
break;
}
}
if (!rb_enc_asciicompat(enc0)) {
len += 19; /* ".force_encoding('')" */
len += strlen(enc0->name);
}
result = rb_str_new5(str, 0, len);
p = RSTRING_PTR(str); pend = p + RSTRING_LEN(str);
@ -3301,10 +3306,14 @@ rb_str_dump(VALUE str)
}
}
*q++ = '"';
if (!rb_enc_asciicompat(enc0)) {
sprintf(q, ".force_encoding(\"%s\")", enc0->name);
enc0 = enc;
}
OBJ_INFECT(result, str);
/* result from dump is ASCII */
rb_enc_associate(result, enc);
rb_enc_associate(result, enc0);
return result;
}