summaryrefslogtreecommitdiff
path: root/sprintf.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-04-13 08:21:41 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-04-13 08:21:41 +0000
commit946fe69932080cad33fd951d32eb68577befb61a (patch)
tree22c418c1c01cb7be24e484c0c1c892631b6fe256 /sprintf.c
parentb2ac99dfa3328ff37bad39bf069a5f9e6f1621c8 (diff)
* sprintf.c (rb_str_format): scan coderange incrementally.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23188 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'sprintf.c')
-rw-r--r--sprintf.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/sprintf.c b/sprintf.c
index c276761..5de2e45 100644
--- a/sprintf.c
+++ b/sprintf.c
@@ -83,10 +83,12 @@ sign_bits(int base, const char *p)
#define FPREC0 128
#define CHECK(l) do {\
+ int cr = ENC_CODERANGE(result);\
while (blen + (l) >= bsiz) {\
bsiz*=2;\
}\
rb_str_resize(result, bsiz);\
+ ENC_CODERANGE_SET(result, cr);\
buf = RSTRING_PTR(result);\
} while (0)
@@ -431,6 +433,8 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
int blen, bsiz;
VALUE result;
+ long scanned = 0;
+ int coderange = ENC_CODERANGE_7BIT;
int width, prec, flags = FNONE;
int nextarg = 1;
int posarg = 0;
@@ -469,6 +473,7 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
rb_enc_copy(result, fmt);
buf = RSTRING_PTR(result);
memset(buf, 0, bsiz);
+ ENC_CODERANGE_SET(result, coderange);
for (; p < end; p++) {
const char *t;
@@ -661,6 +666,13 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
if (OBJ_TAINTED(str)) tainted = 1;
len = RSTRING_LEN(str);
rb_str_set_len(result, blen);
+ if (coderange != ENC_CODERANGE_BROKEN && scanned < blen) {
+ int cr = coderange;
+ scanned = rb_str_coderange_scan_restartable(buf+scanned, buf+blen, enc, &cr);
+ ENC_CODERANGE_SET(result,
+ (cr == ENC_CODERANGE_UNKNOWN ?
+ ENC_CODERANGE_BROKEN : (coderange = cr)));
+ }
enc = rb_enc_check(result, str);
if (flags&(FPREC|FWIDTH)) {
slen = rb_enc_strlen(RSTRING_PTR(str),RSTRING_END(str),enc);
@@ -1043,6 +1055,10 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
if (RTEST(ruby_debug)) rb_raise(rb_eArgError, "%s", mesg);
if (RTEST(ruby_verbose)) rb_warn("%s", mesg);
}
+ if (scanned < blen) {
+ rb_str_coderange_scan_restartable(buf+scanned, buf+blen, enc, &coderange);
+ ENC_CODERANGE_SET(result, coderange);
+ }
rb_str_resize(result, blen);
if (tainted) OBJ_TAINT(result);