archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 09:33:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merges r29146 and r29148 from trunk into ruby_1_9_2.

Browse source 
--
* 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
This commit is contained in:
yugui 2010-10-23 10:02:41 +00:00
parent 0d069bd2df
commit d9cd722638
7 changed files with 48 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

19
ChangeLog
View file

@ -1,3 +1,22 @@
Tue Aug 31 03:42:14 2010 NARUSE, Yui <naruse@ruby-lang.org>
* 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.
Mon Aug 30 15:00:13 2010 NARUSE, Yui <naruse@ruby-lang.org>
* 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.
Sun Aug 29 23:54:10 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/rdoc/parser/ruby.rb (RDoc#parse_call_parameters): don't

2
ext/psych/lib/psych/visitors/yaml_tree.rb
View file

@ -180,7 +180,7 @@ module Psych
quote = false
style = Nodes::Scalar::ANY
if o.index("\x00") || o.count("^ -~\t\r\n").fdiv(o.length) > 0.3
if o.index("\x00") || o.count("\x00-\x7F", "^ -~\t\r\n").fdiv(o.length) > 0.3
str = [o].pack('m').chomp
tag = '!binary' # FIXME: change to below when syck is removed
#tag = 'tag:yaml.org,2002:binary'

2
ext/syck/lib/syck/rubytypes.rb
View file

@ -148,7 +148,7 @@ class String
to_yaml_style or not to_yaml_properties.empty? or self =~ /\n.+/
end
def is_binary_data?
self.count("^ -~\t\r\n").fdiv(self.size) > 0.3 || self.index("\x00") unless self.empty?
self.count("\x00-\x7F", "^ -~\t\r\n").fdiv(self.size) > 0.3 || self.index("\x00") unless self.empty?
end
def String.yaml_new( klass, tag, val )
val = val.unpack("m")[0] if tag == "tag:yaml.org,2002:binary"

4
lib/rdoc/parser.rb
View file

@ -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

26
string.c
View file

@ -5035,6 +5035,15 @@ tr_setup_table(VALUE str, char stable[256], int first,
if (RSTRING_LEN(str) > 1 && rb_enc_ascget(tr.p, tr.pend, &l, enc) == '^') {
cflag = 1;
tr.p += l;
table = rb_hash_new();
ptable = *ctablep;
*ctablep = table;
}
else {
table = rb_hash_new();
ptable = *tablep;
*tablep = table;
}
if (first) {
for (i=0; i<256; i++) {
@ -5054,15 +5063,9 @@ tr_setup_table(VALUE str, char stable[256], int first,
if (!table) {
table = rb_hash_new();
if (cflag) {
ptable = *ctablep;
*ctablep = table;
}
else {
ptable = *tablep;
*tablep = table;
}
}
if (!ptable || !NIL_P(rb_hash_aref(ptable, key))) {
rb_hash_aset(table, key, Qtrue);
}
@ -5083,11 +5086,15 @@ tr_find(unsigned int c, char table[256], VALUE del, VALUE nodel)
else {
VALUE v = UINT2NUM(c);
if (del && !NIL_P(rb_hash_lookup(del, v))) {
if (!nodel || NIL_P(rb_hash_lookup(nodel, v))) {
if (del) {
if (!NIL_P(rb_hash_lookup(del, v)) &&
(!nodel || NIL_P(rb_hash_lookup(nodel, v)))) {
return TRUE;
}
}
else if (nodel && NIL_P(rb_hash_lookup(nodel, v))) {
return TRUE;
}
return FALSE;
}
}
@ -5388,16 +5395,15 @@ rb_str_count(int argc, VALUE *argv, VALUE str)
i = 0;
while (s < send) {
unsigned int c;
int clen;
if (ascompat && (c = *(unsigned char*)s) < 0x80) {
clen = 1;
if (table[c]) {
i++;
}
s++;
}
else {
int clen;
c = rb_enc_codepoint_len(s, send, &clen, enc);
if (tr_find(c, table, del, nodel)) {
i++;

6
test/ruby/test_string.rb
View file

@ -479,6 +479,8 @@ class TestString < Test::Unit::TestCase
assert_equal(4, a.count(S("hello"), S("^l")))
assert_equal(4, a.count(S("ej-m")))
assert_equal(0, S("y").count(S("a\\-z")))
assert_equal(5, "abc\u{3042 3044 3046}".count("^a"))
assert_equal(5, "abc\u{3042 3044 3046}".count("^\u3042"))
assert_raise(ArgumentError) { "foo".count }
end
@ -498,6 +500,10 @@ class TestString < Test::Unit::TestCase
assert_equal(true, "a\u0101".delete("\u0101").ascii_only?)
assert_equal(true, "a\u3041".delete("\u3041").ascii_only?)
assert_equal(false, "a\u3041\u3042".tr("\u3041", "a").ascii_only?)
assert_equal("a", "abc\u{3042 3044 3046}".delete("^a"))
assert_equal("bc\u{3042 3044 3046}", "abc\u{3042 3044 3046}".delete("a"))
assert_equal("\u3042", "abc\u{3042 3044 3046}".delete("^\u3042"))
end
def test_delete!

2
version.h
View file

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