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

transcode.c: add rb_econv_append

Browse Source 
* transcode.c (rb_econv_append): new function to append a string data
  with converting its encoding.  split from rb_econv_substr_append.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42853 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-09-06 02:45:50 +00:00
parent a3a7645f19
commit 7ce11f57ed
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Sep 6 11:45:27 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* transcode.c (rb_econv_append): new function to append a string data
with converting its encoding. split from rb_econv_substr_append.
Fri Sep 6 02:37:22 2013 Aaron Patterson <aaron@tenderlovemaking.com> Fri Sep 6 02:37:22 2013 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych/visitors/yaml_tree.rb: use double quotes when * ext/psych/lib/psych/visitors/yaml_tree.rb: use double quotes when

1
include/ruby/encoding.h
View File

@ -309,6 +309,7 @@ VALUE rb_econv_str_convert(rb_econv_t *ec, VALUE src, int flags);
VALUE rb_econv_substr_convert(rb_econv_t *ec, VALUE src, long byteoff, long bytesize, int flags); VALUE rb_econv_substr_convert(rb_econv_t *ec, VALUE src, long byteoff, long bytesize, int flags);
VALUE rb_econv_str_append(rb_econv_t *ec, VALUE src, VALUE dst, int flags); VALUE rb_econv_str_append(rb_econv_t *ec, VALUE src, VALUE dst, int flags);
VALUE rb_econv_substr_append(rb_econv_t *ec, VALUE src, long byteoff, long bytesize, VALUE dst, int flags); VALUE rb_econv_substr_append(rb_econv_t *ec, VALUE src, long byteoff, long bytesize, VALUE dst, int flags);
VALUE rb_econv_append(rb_econv_t *ec, const char *bytesrc, long bytesize, VALUE dst, int flags);
void rb_econv_binmode(rb_econv_t *ec); void rb_econv_binmode(rb_econv_t *ec);

20
transcode.c
View File

@ -1810,9 +1810,9 @@ rb_econv_asciicompat_encoding(const char *ascii_incompat_name)
} }
VALUE VALUE
rb_econv_substr_append(rb_econv_t *ec, VALUE src, long off, long len, VALUE dst, int flags) rb_econv_append(rb_econv_t *ec, const char *ss, long len, VALUE dst, int flags)
{ {
unsigned const char *ss, *sp, *se; unsigned const char *sp, *se;
unsigned char *ds, *dp, *de; unsigned char *ds, *dp, *de;
rb_econv_result_t res; rb_econv_result_t res;
int max_output; int max_output;
@ -1837,18 +1837,26 @@ rb_econv_substr_append(rb_econv_t *ec, VALUE src, long off, long len, VALUE dst,
rb_str_resize(dst, new_capa); rb_str_resize(dst, new_capa);
rb_str_set_len(dst, dlen); rb_str_set_len(dst, dlen);
} }
ss = sp = (const unsigned char *)RSTRING_PTR(src) + off; sp = (const unsigned char *)ss;
se = ss + len; se = sp + len;
ds = (unsigned char *)RSTRING_PTR(dst); ds = (unsigned char *)RSTRING_PTR(dst);
de = ds + rb_str_capacity(dst); de = ds + rb_str_capacity(dst);
dp = ds += dlen; dp = ds += dlen;
res = rb_econv_convert(ec, &sp, se, &dp, de, flags); res = rb_econv_convert(ec, &sp, se, &dp, de, flags);
off += sp - ss; len -= (const char *)sp - ss;
len -= sp - ss; ss = (const char *)sp;
rb_str_set_len(dst, dlen + (dp - ds)); rb_str_set_len(dst, dlen + (dp - ds));
rb_econv_check_error(ec); rb_econv_check_error(ec);
} while (res == econv_destination_buffer_full); } while (res == econv_destination_buffer_full);
return dst;
}
VALUE
rb_econv_substr_append(rb_econv_t *ec, VALUE src, long off, long len, VALUE dst, int flags)
{
src = rb_str_new_frozen(src);
dst = rb_econv_append(ec, RSTRING_PTR(src) + off, len, dst, flags);
RB_GC_GUARD(src); RB_GC_GUARD(src);
return dst; return dst;
} }