diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-10-23 10:02:41 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-10-23 10:02:41 +0000 |
| commit | d9cd722638146ace80396e32a0d74a42893a8015 (patch) | |
| tree | 654afbcd7c3b15c6da71d32d40efe031aa8cf6b4 /lib | |
| parent | 0d069bd2df3ea467efb1d9d3a64ae2334b5cc241 (diff) | |
merges r29146 and r29148 from trunk into ruby_1_9_2.
--
* string.c (tr_setup_table): initialize negating table when
negating string is given. [ruby-core:31851]
* string.c (tr_find): add a sentence for the time when
target characters include negating one.
* string.c (rb_str_count): move definition.
--
* string.c (tr_setup_table): fix bug in r29146.
Initialize table even if cflag is 0; tr_find see whether
del is empty or not.
* string.c (tr_find): nodel can't be NULL; if NULL, it means
it is not specified.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@29569 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rdoc/parser.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/rdoc/parser.rb b/lib/rdoc/parser.rb index 9cfda127d9..1e4ab7c7a4 100644 --- a/lib/rdoc/parser.rb +++ b/lib/rdoc/parser.rb @@ -76,9 +76,9 @@ class RDoc::Parser elsif s.scan(/<%|%>/).length >= 4 || s.index("\x00") then true elsif 0.respond_to? :fdiv then - s.count("^ -~\t\r\n").fdiv(s.size) > 0.3 + s.count("\x00-\x7F", "^ -~\t\r\n").fdiv(s.size) > 0.3 else # HACK 1.8.6 - (s.count("^ -~\t\r\n").to_f / s.size) > 0.3 + (s.count("\x00-\x7F", "^ -~\t\r\n").to_f / s.size) > 0.3 end end |