archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merges r32000 from trunk into ruby_1_9_2.

Browse source 
--
* io.c (io_getc): should be 7bit if ascii.  fixes #4557

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32380 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2011-07-03 12:23:54 +00:00
parent 6cdc9b6097
commit 909a92ea6d
4 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Sat Jun 11 18:02:09 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (io_getc): should be 7bit if ascii. fixes #4557
Sat Jun 11 16:28:25 2011 Kouhei Sutou <kou@cozmixng.org>
* lib/rexml/formatters/pretty.rb

2
io.c
View file

@ -2851,7 +2851,7 @@ io_getc(rb_io_t *fptr, rb_encoding *enc)
}
else {
io_shift_cbuf(fptr, MBCLEN_CHARFOUND_LEN(r), &str);
cr = ENC_CODERANGE_VALID;
cr = ISASCII(r) ? ENC_CODERANGE_7BIT : ENC_CODERANGE_VALID;
}
str = io_enc_str(str, fptr);
ENC_CODERANGE_SET(str, cr);

9
test/ruby/test_io_m17n.rb
View file

@ -2047,5 +2047,14 @@ EOT
r.close
end)
end
def test_getc_ascii_only
bug4557 = '[ruby-core:35630]'
c = with_tmpdir {
open("a", "wb") {|f| f.puts "a"}
open("a", "rt") {|f| f.getc}
}
assert(c.ascii_only?, "should be ascii_only #{bug4557}")
end
end

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 279
#define RUBY_PATCHLEVEL 280
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1