kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* re.c (rb_reg_expr_str): fix broken Regexp#inspect when it

Browse source 
is ASCII-8BIT and non-ASCII character.
  The length of character should be from original byte string.
  [ruby-core:31431]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28715 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2010-07-22 07:29:32 +00:00
parent 24b17a2e87
commit 203ebcbb92
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Thu Jul 22 16:27:41 2010 NARUSE, Yui <naruse@ruby-lang.org>
* re.c (rb_reg_expr_str): fix broken Regexp#inspect when it
is ASCII-8BIT and non-ASCII character.
The length of character should be from original byte string.
[ruby-core:31431]
Thu Jul 22 14:30:17 2010 NARUSE, Yui <naruse@ruby-lang.org>
* include/ruby/missing.h: add prototype for ruby_close().

3
re.c
View file

@ -373,7 +373,8 @@ rb_reg_expr_str(VALUE str, const char *s, long len,
int l;
if (resenc) {
unsigned int c = rb_enc_mbc_to_codepoint(p, pend, enc);
l = rb_str_buf_cat_escaped_char(str, c, unicode_p);
l = rb_enc_codelen(c, enc);
rb_str_buf_cat_escaped_char(str, c, unicode_p);
}
else {
l = mbclen(p, pend, enc);

4
test/ruby/test_regexp.rb
View file

@ -155,8 +155,8 @@ class TestRegexp < Test::Unit::TestCase
assert_equal('/\/x/i', /\/x/i.inspect)
assert_equal('/\x00/i', /#{"\0"}/i.inspect)
assert_equal("/\n/i", /#{"\n"}/i.inspect)
s = [0xff].pack("C")
assert_equal('/\/\xFF/i', /\/#{s}/i.inspect)
s = [0xf1, 0xf2, 0xf3].pack("C*")
assert_equal('/\/\xF1\xF2\xF3/i', /\/#{s}/i.inspect)
end
def test_char_to_option