diff options
| author | Nobuyoshi Nakada <[email protected]> | 2022-08-30 18:12:08 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <[email protected]> | 2022-08-31 17:27:59 +0900 |
| commit | 576bdec03f0d58847690a0607c788ada433ce60f () | |
| tree | da8277b325bfa1c033c2572662a6e781b589ae0f | |
| parent | 9dc60653db186b1ae9400ed75b413a07728ce6ff (diff) | |
[Bug #18973] Promote US-ASCII to ASCII-8BIT when adding 8-bit char
Notes: Merged: https://.com/ruby/ruby/pull/6306
| -rw-r--r-- | internal/string.h | 1 | ||||
| -rw-r--r-- | sprintf.c | 13 | ||||
| -rw-r--r-- | string.c | 32 | ||||
| -rw-r--r-- | test/ruby/test_sprintf.rb | 3 |
4 files changed, 37 insertions, 12 deletions
@@ -43,6 +43,7 @@ char *rb_str_to_cstr(VALUE str); const char *ruby_escaped_char(int c); void rb_str_make_independent(VALUE str); int rb_enc_str_coderange_scan(VALUE str, rb_encoding *enc); static inline bool STR_EMBED_P(VALUE str); static inline bool STR_SHARED_P(VALUE str); @@ -454,13 +454,18 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt) str = tmp; goto format_s1; } - else { - n = NUM2INT(val); - if (n >= 0) n = rb_enc_codelen((c = n), enc); - } if (n <= 0) { rb_raise(rb_eArgError, "invalid character"); } if (!(flags & FWIDTH)) { CHECK(n); rb_enc_mbcput(c, &buf[blen], enc); @@ -3481,17 +3481,13 @@ rb_str_concat(VALUE str1, VALUE str2) return rb_str_append(str1, str2); } - encidx = rb_enc_to_index(enc); - if (encidx == ENCINDEX_ASCII_8BIT || encidx == ENCINDEX_US_ASCII) { - /* US-ASCII automatically extended to ASCII-8BIT */ char buf[1]; buf[0] = (char)code; - if (code > 0xFF) { - rb_raise(rb_eRangeError, "%u out of char range", code); - } rb_str_cat(str1, buf, 1); - if (encidx == ENCINDEX_US_ASCII && code > 127) { - rb_enc_associate_index(str1, ENCINDEX_ASCII_8BIT); ENC_CODERANGE_SET(str1, ENC_CODERANGE_VALID); } } @@ -3524,6 +3520,26 @@ rb_str_concat(VALUE str1, VALUE str2) return str1; } /* * call-seq: * prepend(*other_strings) -> string @@ -369,6 +369,9 @@ class TestSprintf < Test::Unit::TestCase assert_equal(" " * BSIZ + "a", sprintf("%#{ BSIZ + 1 }c", ?a)) assert_equal("a" + " " * BSIZ, sprintf("%-#{ BSIZ + 1 }c", ?a)) assert_raise(ArgumentError) { sprintf("%c", -1) } end def test_string |