March 2010 - macruby-changes - lists.macosforge.org

[3799] MacRuby/trunk/spec/frozen/language/regexp/escapes_spec.rb
by source_changes＠macosforge.org 18 Mar '10

18 Mar '10

Revision: 3799 http://trac.macosforge.org/projects/ruby/changeset/3799 Author: lsansonetti(a)apple.com Date: 2010-03-17 22:13:12 -0700 (Wed, 17 Mar 2010) Log Message: ----------- \v inside regexps is not supported by ICU Modified Paths: -------------- MacRuby/trunk/spec/frozen/language/regexp/escapes_spec.rb Modified: MacRuby/trunk/spec/frozen/language/regexp/escapes_spec.rb =================================================================== --- MacRuby/trunk/spec/frozen/language/regexp/escapes_spec.rb 2010-03-18 05:12:46 UTC (rev 3798) +++ MacRuby/trunk/spec/frozen/language/regexp/escapes_spec.rb 2010-03-18 05:13:12 UTC (rev 3799) @@ -4,7 +4,9 @@ describe "Regexps with escape characters" do it "they're supported" do /\t/.match("\t").to_a.should == ["\t"] # horizontal tab - /\v/.match("\v").to_a.should == ["\v"] # vertical tab + not_compliant_on :macruby do + /\v/.match("\v").to_a.should == ["\v"] # vertical tab + end /\n/.match("\n").to_a.should == ["\n"] # newline /\r/.match("\r").to_a.should == ["\r"] # return /\f/.match("\f").to_a.should == ["\f"] # form feed

1 0

[3798] MacRuby/trunk/spec/frozen/tags/macruby/language
by source_changes＠macosforge.org 18 Mar '10

18 Mar '10

Revision: 3798 http://trac.macosforge.org/projects/ruby/changeset/3798 Author: lsansonetti(a)apple.com Date: 2010-03-17 22:12:46 -0700 (Wed, 17 Mar 2010) Log Message: ----------- tag failing specs Modified Paths: -------------- MacRuby/trunk/spec/frozen/tags/macruby/language/regexp/modifiers_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/language/regexp_tags.txt Modified: MacRuby/trunk/spec/frozen/tags/macruby/language/regexp/modifiers_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/language/regexp/modifiers_tags.txt 2010-03-18 05:05:29 UTC (rev 3797) +++ MacRuby/trunk/spec/frozen/tags/macruby/language/regexp/modifiers_tags.txt 2010-03-18 05:12:46 UTC (rev 3798) @@ -1,2 +1,4 @@ fails:Regexps with modifers supports /o (once) fails:Regexps with modifers invokes substitutions for /o only once +fails:Regexps with modifers supports (?imx-imx) (inline modifiers) +fails:Regexps with modifers supports (?imx-imx:expr) (scoped inline modifiers) Modified: MacRuby/trunk/spec/frozen/tags/macruby/language/regexp_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/language/regexp_tags.txt 2010-03-18 05:05:29 UTC (rev 3797) +++ MacRuby/trunk/spec/frozen/tags/macruby/language/regexp_tags.txt 2010-03-18 05:12:46 UTC (rev 3798) @@ -1 +1,2 @@ fails:Literal Regexps matches against $_ (last input) in a conditional if no explicit matchee provided +fails:Literal Regexps allows unescaped / to be used with %r

1 0

[3797] MacRuby/trunk/spec/frozen/tags/macruby/core/regexp/to_s_tags.txt
by source_changes＠macosforge.org 18 Mar '10

18 Mar '10

Revision: 3797 http://trac.macosforge.org/projects/ruby/changeset/3797 Author: lsansonetti(a)apple.com Date: 2010-03-17 22:05:29 -0700 (Wed, 17 Mar 2010) Log Message: ----------- tag regexp #to_s specs that use nested option groups Added Paths: ----------- MacRuby/trunk/spec/frozen/tags/macruby/core/regexp/to_s_tags.txt Added: MacRuby/trunk/spec/frozen/tags/macruby/core/regexp/to_s_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/regexp/to_s_tags.txt (rev 0) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/regexp/to_s_tags.txt 2010-03-18 05:05:29 UTC (rev 3797) @@ -0,0 +1,3 @@ +fails:Regexp#to_s displays single group with same options as main regex as the main regex +fails:Regexp#to_s returns a string in (?xxx:yyy) notation +fails:Regexp#to_s handles abusive option groups

1 0

[3796] MacRuby/trunk/spec/frozen/tags/macruby/core/string/index_tags.txt
by source_changes＠macosforge.org 18 Mar '10

18 Mar '10

Revision: 3796 http://trac.macosforge.org/projects/ruby/changeset/3796 Author: lsansonetti(a)apple.com Date: 2010-03-17 22:02:36 -0700 (Wed, 17 Mar 2010) Log Message: ----------- untag specs that now pass Modified Paths: -------------- MacRuby/trunk/spec/frozen/tags/macruby/core/string/index_tags.txt Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/string/index_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/string/index_tags.txt 2010-03-18 05:02:24 UTC (rev 3795) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/string/index_tags.txt 2010-03-18 05:02:36 UTC (rev 3796) @@ -1,4 +1 @@ -fails:String#index with String behaves the same as String#index(char) for one-character strings -fails:String#index with String returns the index of the first occurrence of the given substring -fails:String#index with String starts the search at the given offset -fails:String#index with Regexp behaves the same as String#index(string) for escaped string regexps +fails:String#index with Regexp supports \G which matches at the given start offset

1 0

[3795] MacRuby/trunk/string.c
by source_changes＠macosforge.org 18 Mar '10

18 Mar '10

Revision: 3795 http://trac.macosforge.org/projects/ruby/changeset/3795 Author: lsansonetti(a)apple.com Date: 2010-03-17 22:02:24 -0700 (Wed, 17 Mar 2010) Log Message: ----------- fix some bugs in #index Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2010-03-18 03:49:19 UTC (rev 3794) +++ MacRuby/trunk/string.c 2010-03-18 05:02:24 UTC (rev 3795) @@ -1887,7 +1887,7 @@ if (pos < 0) { pos += len; } - if (pos < 0 || pos >= len) { + if (pos < 0) { if (TYPE(sub) == T_REGEXP) { rb_backref_set(Qnil); } @@ -1900,6 +1900,9 @@ switch (TYPE(sub)) { case T_REGEXP: + if (pos > len) { + return Qnil; + } pos = rb_reg_search(sub, self, pos, false); break; @@ -1907,8 +1910,13 @@ StringValue(sub); // fall through case T_STRING: - pos = str_index_for_string(RSTR(self), str_need_string(sub), - pos, -1, false, true); + if (pos == len && rb_str_chars_len(sub) == 0) { + // Do nothing... RubySpec compliance... + } + else { + pos = str_index_for_string(RSTR(self), str_need_string(sub), + pos, -1, false, true); + } break; }

1 0

[3794] MacRuby/trunk/spec/frozen/tags/macruby/core/string/split_tags.txt
by source_changes＠macosforge.org 18 Mar '10

18 Mar '10

Revision: 3794 http://trac.macosforge.org/projects/ruby/changeset/3794 Author: lsansonetti(a)apple.com Date: 2010-03-17 20:49:19 -0700 (Wed, 17 Mar 2010) Log Message: ----------- untag specs that now pass Modified Paths: -------------- MacRuby/trunk/spec/frozen/tags/macruby/core/string/split_tags.txt Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/string/split_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/string/split_tags.txt 2010-03-18 03:49:07 UTC (rev 3793) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/string/split_tags.txt 2010-03-18 03:49:19 UTC (rev 3794) @@ -1,8 +1,2 @@ -critical:String#split with String defaults to $; when string isn't given or nil -critical:String#split with Regexp defaults to $; when regexp isn't given or nil -fails:String#split with String ignores leading and continuous whitespace when string is a single space -fails:String#split with String splits between characters when its argument is an empty string fails:String#split with String returns subclass instances based on self -fails:String#split with String taints the resulting strings if self is tainted fails:String#split with Regexp returns subclass instances based on self -fails:String#split with Regexp taints the resulting strings if self is tainted

1 0

[3793] MacRuby/trunk/string.c
by source_changes＠macosforge.org 18 Mar '10

18 Mar '10

Revision: 3793 http://trac.macosforge.org/projects/ruby/changeset/3793 Author: lsansonetti(a)apple.com Date: 2010-03-17 20:49:07 -0700 (Wed, 17 Mar 2010) Log Message: ----------- fixed a bunch of bugs in #split Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2010-03-18 01:53:36 UTC (rev 3792) +++ MacRuby/trunk/string.c 2010-03-18 03:49:07 UTC (rev 3793) @@ -2766,66 +2766,67 @@ } } + const int lim_orig = lim; long beg = 0; - if (awk_split || spat_string) { - if (spat != Qnil) { - if (spat_len == 0) { - do { - VALUE substr = rstr_substr(str, beg, 1); - rb_ary_push(result, substr); - beg++; - if (beg >= len) { - break; - } + if (awk_split) { + UChar *chars = NULL; + long chars_len = 0; + bool need_free = false; + + rb_str_get_uchars(str, &chars, &chars_len, &need_free); + + for (long i = 0; i < chars_len; i++) { + UChar c = chars[i]; + if (c == ' ' || c == '\t' || c == '\n' || c == '\v') { + VALUE substr = rstr_substr(str, beg, i - beg); + str_strip(substr, 0); + if (rb_str_chars_len(substr) > 0) { + rb_ary_push(result, substr); } - while (limit == Qnil || --lim > 1); + beg = i + 1; } - else { - rb_str_t *spat_str = str_need_string(spat); - do { - const long pos = str_index_for_string(RSTR(str), spat_str, - beg, -1, false, false); - if (pos == -1) { - break; - } - rb_ary_push(result, rstr_substr(str, beg, pos - beg)); - beg = pos + 1; + if (limit != Qnil && --lim <= 0) { + break; + } + } + + if (need_free) { + free(chars); + } + } + else if (spat_string) { + if (spat_len == 0) { + do { + VALUE substr = rstr_substr(str, beg, 1); + rb_ary_push(result, substr); + beg++; + if (beg >= len) { + break; } - while (limit == Qnil || --lim > 1); } + while (limit == Qnil || --lim > 1); } else { - UChar *chars = NULL; - long chars_len = 0; - bool need_free = false; - - rb_str_get_uchars(str, &chars, &chars_len, &need_free); - - for (long i = 0; i < chars_len; i++) { - UChar c = chars[i]; - if (c == ' ' || c == '\t' || c == '\n') { - VALUE substr = rstr_substr(str, beg, i - beg); - str_strip(substr, 0); - if (rb_str_chars_len(substr) > 0) { - rb_ary_push(result, substr); - } - beg = i + 1; - } - if (limit != Qnil && --lim <= 0) { + rb_str_t *spat_str = str_need_string(spat); + const long spat_len = str_length(spat_str, false); + do { + const long pos = str_index_for_string(RSTR(str), spat_str, + beg, -1, false, false); + if (pos == -1) { break; } + rb_ary_push(result, rstr_substr(str, beg, pos - beg)); + beg = pos + spat_len; } - - if (need_free) { - free(chars); - } + while (limit == Qnil || --lim > 1); } } else { long start = beg; bool last_null = false; +again: do { - const long pos = rb_reg_search(spat, str, beg, false); + const long pos = rb_reg_search(spat, str, start, false); if (pos < 0) { break; } @@ -2835,38 +2836,51 @@ rb_match_result_t *results = rb_reg_match_results(match, &count); assert(count > 0); - if (beg == pos && results[0].beg == results[0].end) { + if (start == pos && results[0].beg == results[0].end) { if (last_null) { + VALUE substr; if (beg + 1 <= len) { - rb_ary_push(result, rstr_substr(str, beg, 1)); + substr = rstr_substr(str, beg, 1); } + else { + substr = rb_str_new(NULL, 0); + } + rb_ary_push(result, substr); beg = start; } else { start++; last_null = true; - continue; + goto again; } } else { rb_ary_push(result, rstr_substr(str, beg, pos - beg)); - beg = results[0].end; + beg = start = results[0].end; } last_null = false; for (int i = 1; i < count; i++) { - VALUE match_str = rb_reg_nth_match(i, match); - if (match_str != Qnil) { - rb_ary_push(result, rb_reg_nth_match(i, match)); + if (results[i].beg == -1 || results[i].end == -1) { + continue; } + VALUE substr; + if (results[i].beg == results[i].end) { + substr = rb_str_new(NULL, 0); + } + else { + substr = rstr_substr(str, results[i].beg, + results[i].end - results[i].beg); + } + rb_ary_push(result, substr); } } while (limit == Qnil || --lim > 1); } - if (len > 0 && (!NIL_P(limit) || len > beg || lim < 0)) { + if (len > 0 && (!NIL_P(limit) || len > beg || lim_orig < 0)) { VALUE tmp; - if (len == beg) { + if (beg >= len) { tmp = rb_str_new(NULL, 0); } else { @@ -2875,7 +2889,7 @@ rb_ary_push(result, tmp); } - if (NIL_P(limit) && lim == 0) { + if (NIL_P(limit) && lim_orig == 0) { while (true) { const long n = RARRAY_LEN(result); if (n > 0 && rb_str_chars_len(RARRAY_AT(result, n - 1)) == 0) { @@ -2887,6 +2901,12 @@ } } + if (OBJ_TAINTED(str)) { + for (int i = 0, count = RARRAY_LEN(result); i < count; i++) { + OBJ_TAINT(RARRAY_AT(result, i)); + } + } + return result; }

1 0

[3792] MacRuby/trunk/spec/frozen/tags/macruby/core/string
by source_changes＠macosforge.org 18 Mar '10

18 Mar '10

Revision: 3792 http://trac.macosforge.org/projects/ruby/changeset/3792 Author: lsansonetti(a)apple.com Date: 2010-03-17 18:53:36 -0700 (Wed, 17 Mar 2010) Log Message: ----------- updating tags Modified Paths: -------------- MacRuby/trunk/spec/frozen/tags/macruby/core/string/gsub_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/string/scan_tags.txt Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/string/gsub_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/string/gsub_tags.txt 2010-03-18 01:53:09 UTC (rev 3791) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/string/gsub_tags.txt 2010-03-18 01:53:36 UTC (rev 3792) @@ -8,3 +8,4 @@ fails:String#gsub with pattern and Hash raises a TypeError if the hash has a default proc fails:String#gsub! with pattern and replacement raises a RuntimeError when self is frozen fails:String#gsub! with pattern and block raises a RuntimeError when self is frozen +fails:String#gsub with pattern and replacement supports \G which matches at the beginning of the remaining (non-matched) string Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/string/scan_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/string/scan_tags.txt 2010-03-18 01:53:09 UTC (rev 3791) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/string/scan_tags.txt 2010-03-18 01:53:36 UTC (rev 3792) @@ -1,5 +1 @@ -fails:String#scan sets $~ to MatchData of last match and nil when there's none -fails:String#scan taints the match strings if self is tainted, unless the taint happens in the method call -fails:String#scan with pattern and block sets $~ for access from the block -fails:String#scan with pattern and block sets $~ to MatchData of last match and nil when there's none for access from outside -fails:String#scan with pattern and block taints the match strings if self is tainted, unless the tain happens inside the scan +fails:String#scan supports \G which matches the end of the previous match / string start for first match

1 0

[3791] MacRuby/trunk/string.c
by source_changes＠macosforge.org 18 Mar '10

18 Mar '10

Revision: 3791 http://trac.macosforge.org/projects/ruby/changeset/3791 Author: lsansonetti(a)apple.com Date: 2010-03-17 18:53:09 -0700 (Wed, 17 Mar 2010) Log Message: ----------- fixing a couple of bugs in #scan Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2010-03-18 01:34:30 UTC (rev 3790) +++ MacRuby/trunk/string.c 2010-03-18 01:53:09 UTC (rev 3791) @@ -2617,15 +2617,17 @@ const bool block_given = rb_block_given_p(); pat = get_pat(pat, true); - long start = 0; + const bool tainted = OBJ_TAINTED(self) || OBJ_TAINTED(pat); VALUE ary = 0; if (!block_given) { ary = rb_ary_new(); } + VALUE match = Qnil; + long start = 0; while (rb_reg_search(pat, self, start, false) >= 0) { - VALUE match = rb_backref_get(); + match = rb_backref_get(); int count = 0; rb_match_result_t *results = rb_reg_match_results(match, &count); @@ -2641,11 +2643,18 @@ VALUE scan_result; if (count == 1) { scan_result = rb_reg_nth_match(0, match); + if (tainted) { + OBJ_TAINT(scan_result); + } } else { scan_result = rb_ary_new2(count); for (int i = 1; i < count; i++) { - rb_ary_push(scan_result, rb_reg_nth_match(i, match)); + VALUE substr = rb_reg_nth_match(i, match); + if (tainted) { + OBJ_TAINT(tainted); + } + rb_ary_push(scan_result, substr); } } @@ -2658,10 +2667,10 @@ else { rb_ary_push(ary, scan_result); } - - rb_backref_set(match); } + rb_backref_set(match); + return block_given ? self : ary; }

1 0

[3790] MacRuby/trunk/string.c
by source_changes＠macosforge.org 18 Mar '10

18 Mar '10

Revision: 3790 http://trac.macosforge.org/projects/ruby/changeset/3790 Author: lsansonetti(a)apple.com Date: 2010-03-17 18:34:30 -0700 (Wed, 17 Mar 2010) Log Message: ----------- fixed another minor bug in rb_reg_regsub() Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2010-03-18 01:07:57 UTC (rev 3789) +++ MacRuby/trunk/string.c 2010-03-18 01:34:30 UTC (rev 3790) @@ -3187,6 +3187,9 @@ if (c != '\\') { continue; } + if (i + 1 == str_chars_len) { + break; + } if (val == 0) { val = rb_unicode_str_new(NULL, 0); @@ -3194,9 +3197,6 @@ str_concat_uchars(RSTR(val), &str_chars[pos], i - pos); i++; - if (i == str_chars_len) { - break; - } pos = i + 1; int no = -1;

1 0