diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-02-17 02:00:05 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-02-17 02:00:05 +0000 |
commit | 0f4199fb56ec12dae32a6fa099f15aaa7e55d10f (patch) | |
tree | 04c8df1b84a56c8b55f3f929b0d9744acfe7196c /re.c | |
parent | 35cb0f807b4689b0405dfbb2821e13f14c1fca45 (diff) | |
download | ruby-0f4199fb56ec12dae32a6fa099f15aaa7e55d10f.tar.gz |
* re.c (rb_reg_quote): return US-ASCII string consistently.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15515 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 're.c')
-rw-r--r-- | re.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -2654,7 +2654,7 @@ rb_reg_quote(VALUE str) } s += clen; } - if (ascii_only && rb_enc_get_index(str) != 0) { + if (ascii_only) { str = rb_str_new3(str); rb_enc_associate(str, rb_usascii_encoding()); } @@ -2662,7 +2662,10 @@ rb_reg_quote(VALUE str) meta_found: tmp = rb_str_new(0, RSTRING_LEN(str)*2); - if (!ascii_only) { + if (ascii_only) { + rb_enc_associate(tmp, rb_usascii_encoding()); + } + else { rb_enc_copy(tmp, str); } t = RSTRING_PTR(tmp); |