diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-01-14 03:02:57 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-01-14 03:02:57 +0000 |
commit | c53470fd47fa62eed38af281017e10a41ef8ff2a (patch) | |
tree | c5db8fad2a8b3bfaf2d5151b0c07594096478e8f | |
parent | f2aa0fd5d4ffa77a5c4bdd8698ac774b20540c62 (diff) | |
download | ruby-c53470fd47fa62eed38af281017e10a41ef8ff2a.tar.gz |
* sprintf.c (rb_enc_vsprintf): relaxed the restriction. since the
implementation deeply depends on plain char, so wchar_t based
encodings are not supported.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34300 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | sprintf.c | 5 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Sat Jan 14 12:02:55 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * sprintf.c (rb_enc_vsprintf): relaxed the restriction. since the + implementation deeply depends on plain char, so wchar_t based + encodings are not supported. + Sat Jan 14 12:00:20 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> * error.c (exc_equal): ignore exceptions during implicit @@ -1169,8 +1169,9 @@ rb_enc_vsprintf(rb_encoding *enc, const char *fmt, va_list ap) f._w = 120; result = rb_str_buf_new(f._w); if (enc) { - if (!rb_enc_asciicompat(enc)) { - rb_raise(rb_eArgError, "cannot construct ASCII-incompatible encoding string: %s", + if (rb_enc_mbminlen(enc) > 1) { + /* the implementation deeply depends on plain char */ + rb_raise(rb_eArgError, "cannot construct wchar_t based encoding string: %s", rb_enc_name(enc)); } rb_enc_associate(result, enc); |