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

[3679] MacRuby/branches/icu/string.c
by source_changes＠macosforge.org 03 Mar '10

03 Mar '10

Revision: 3679 http://trac.macosforge.org/projects/ruby/changeset/3679 Author: lsansonetti(a)apple.com Date: 2010-03-03 12:17:56 -0800 (Wed, 03 Mar 2010) Log Message: ----------- added #chop Modified Paths: -------------- MacRuby/branches/icu/string.c Modified: MacRuby/branches/icu/string.c =================================================================== --- MacRuby/branches/icu/string.c 2010-03-03 05:07:35 UTC (rev 3678) +++ MacRuby/branches/icu/string.c 2010-03-03 20:17:56 UTC (rev 3679) @@ -2990,6 +2990,60 @@ /* * call-seq: + * str.chop! => str or nil + * + * Processes str as for <code>String#chop</code>, returning str, + * or <code>nil</code> if str is the empty string. See also + * <code>String#chomp!</code>. + */ + +static VALUE +rstr_chop_bang(VALUE str, SEL sel) +{ + rstr_modify(str); + + const long len = str_length(RSTR(str), false); + if (len == 0) { + return Qnil; + } + + long to_del = 1; + if (len >= 2 && rb_str_get_uchar(str, len - 1) == '\n' + && rb_str_get_uchar(str, len - 2) == '\r') { + to_del++; + } + + str_delete(RSTR(str), len - to_del, to_del, false); + return str; +} + +/* + * call-seq: + * str.chop => new_str + * + * Returns a new <code>String</code> with the last character removed. If the + * string ends with <code>\r\n</code>, both characters are removed. Applying + * <code>chop</code> to an empty string returns an empty + * string. <code>String#chomp</code> is often a safer alternative, as it leaves + * the string unchanged if it doesn't end in a record separator. + * + * "string\r\n".chop #=> "string" + * "string\n\r".chop #=> "string\n" + * "string\n".chop #=> "string" + * "string".chop #=> "strin" + * "x".chop.chop #=> "" + */ + +static VALUE +rstr_chop(VALUE str, SEL sel) +{ + str = rb_str_new3(str); + rstr_chop_bang(str, 0); + return str; +} + +/* + * call-seq: * str.sub!(pattern, replacement) => str or nil * str.sub!(pattern) {|match| block } => str or nil * @@ -4340,6 +4394,8 @@ rb_objc_define_method(rb_cRubyString, "to_f", rstr_to_f, 0); rb_objc_define_method(rb_cRubyString, "chomp", rstr_chomp, -1); rb_objc_define_method(rb_cRubyString, "chomp!", rstr_chomp_bang, -1); + rb_objc_define_method(rb_cRubyString, "chop", rstr_chop, -1); + rb_objc_define_method(rb_cRubyString, "chop!", rstr_chop_bang, -1); rb_objc_define_method(rb_cRubyString, "sub", rstr_sub, -1); rb_objc_define_method(rb_cRubyString, "sub!", rstr_sub_bang, -1); rb_objc_define_method(rb_cRubyString, "gsub", rstr_gsub, -1);

1 0

[3678] MacRuby/branches/icu/string.c
by source_changes＠macosforge.org 03 Mar '10

03 Mar '10

Revision: 3678 http://trac.macosforge.org/projects/ruby/changeset/3678 Author: lsansonetti(a)apple.com Date: 2010-03-02 21:07:35 -0800 (Tue, 02 Mar 2010) Log Message: ----------- added support for patterns inside regexp replacements Modified Paths: -------------- MacRuby/branches/icu/string.c Modified: MacRuby/branches/icu/string.c =================================================================== --- MacRuby/branches/icu/string.c 2010-03-03 03:36:52 UTC (rev 3677) +++ MacRuby/branches/icu/string.c 2010-03-03 05:07:35 UTC (rev 3678) @@ -816,6 +816,14 @@ } static void +str_concat_uchars(rb_str_t *self, const UChar *chars, long len) +{ + assert(str_try_making_data_uchars(self)); + + str_concat_bytes(self, (const char *)chars, UCHARS_TO_BYTES(len)); +} + +static void str_concat_string(rb_str_t *self, rb_str_t *str) { if (str->length_in_bytes == 0) { @@ -2991,10 +2999,110 @@ */ static VALUE -rb_reg_regsub(VALUE str, VALUE src, VALUE match, VALUE regexp) +rb_reg_regsub(VALUE str, VALUE src, VALUE regexp, rb_match_result_t *results, + int results_count) { - // TODO - return str; + VALUE val = 0; + + UChar *str_chars = NULL; + long str_chars_len = 0; + bool str_chars_need_free = false; + + rb_str_get_uchars(str, &str_chars, &str_chars_len, + &str_chars_need_free); + + UChar *src_chars = NULL; + long src_chars_len = 0; + bool src_chars_need_free = false; + + rb_str_get_uchars(src, &src_chars, &src_chars_len, + &src_chars_need_free); + + long pos = 0; + + for (long i = 0; i < str_chars_len; i++) { + UChar c = str_chars[i]; + if (c != '\\') { + continue; + } + + if (val == 0) { + val = rb_unicode_str_new(NULL, 0); + } + str_concat_uchars(RSTR(val), &str_chars[pos], i - pos); + + i++; + if (i == str_chars_len) { + break; + } + pos = i + 1; + + int no = -1; + c = str_chars[i]; + switch (c) { + case '1': case '2': case '3': + case '4': case '5': case '6': + case '7': case '8': case '9': + no = c - '0'; + break; + + case '0': + case '&': + no = 0; + break; + + case '`': + str_concat_uchars(RSTR(val), src_chars, results[0].beg); + break; + + case '\'': + str_concat_uchars(RSTR(val), &src_chars[results[0].end], + src_chars_len - results[0].end); + break; + + case '+': + no = results_count - 1; + while (results[no].beg == -1 && no > 0) { + no--; + } + if (no == 0) { + no = -1; + } + break; + + case '\\': + default: + str_append_uchar(RSTR(val), c); + break; + } + + if (no >= 0) { + if (no >= results_count) { + continue; + } + if (results[no].beg == -1) { + continue; + } + str_concat_uchars(RSTR(val), &src_chars[results[no].beg], + results[no].end - results[no].beg); + } + } + + if (str_chars_need_free) { + free(str_chars); + } + if (src_chars_need_free) { + free(src_chars); + } + + if (val == 0) { + return str; + } + + if (pos < str_chars_len) { + str_concat_uchars(RSTR(val), &str_chars[pos], str_chars_len - pos); + } + return val; } static VALUE @@ -3043,7 +3151,7 @@ } } else { - repl = rb_reg_regsub(repl, str, match, pat); + repl = rb_reg_regsub(repl, str, pat, results, count); } rstr_modify(str); @@ -3178,7 +3286,7 @@ } } else { - val = rb_reg_regsub(repl, str, match, pat); + val = rb_reg_regsub(repl, str, pat, results, count); } if (pos - offset > 0) {

1 0

[3677] MacRuby/branches/icu/string.c
by source_changes＠macosforge.org 03 Mar '10

03 Mar '10

Revision: 3677 http://trac.macosforge.org/projects/ruby/changeset/3677 Author: lsansonetti(a)apple.com Date: 2010-03-02 19:36:52 -0800 (Tue, 02 Mar 2010) Log Message: ----------- added #insert, cleanup a few things Modified Paths: -------------- MacRuby/branches/icu/string.c Modified: MacRuby/branches/icu/string.c =================================================================== --- MacRuby/branches/icu/string.c 2010-03-03 03:22:13 UTC (rev 3676) +++ MacRuby/branches/icu/string.c 2010-03-03 03:36:52 UTC (rev 3677) @@ -1141,6 +1141,8 @@ static void rstr_splice(VALUE self, long beg, long len, VALUE str) { + rb_str_t *strstr = str_need_string(str); + if (len < 0) { rb_raise(rb_eIndexError, "negative length %ld", len); } @@ -1162,13 +1164,23 @@ rstr_modify(self); - str_splice(RSTR(self), beg, len, str_need_string(str), false); + str_splice(RSTR(self), beg, len, strstr, false); - if (OBJ_TAINTED(str)) { + if (OBJ_TAINTED(strstr)) { OBJ_TAINT(self); } } +static void +rstr_append(VALUE str, VALUE substr) +{ + str_concat_string(RSTR(str), str_need_string(substr)); + + if (OBJ_TAINTED(substr)) { + OBJ_TAINT(str); + } +} + static VALUE str_trim(VALUE str) { @@ -1756,6 +1768,39 @@ /* * call-seq: + * str.insert(index, other_str) => str + * + * Inserts other_str before the character at the given + * index, modifying str. Negative indices count from the + * end of the string, and insert after the given character. + * The intent is insert aString so that it starts at the given + * index. + * + * "abcd".insert(0, 'X') #=> "Xabcd" + * "abcd".insert(3, 'X') #=> "abcXd" + * "abcd".insert(4, 'X') #=> "abcdX" + * "abcd".insert(-3, 'X') #=> "abXcd" + * "abcd".insert(-1, 'X') #=> "abcdX" + */ + +static VALUE +rstr_insert(VALUE str, SEL sel, VALUE idx, VALUE substr) +{ + long pos = NUM2LONG(idx); + if (pos == -1) { + rstr_append(str, substr); + } + else { + if (pos < 0) { + pos++; + } + rstr_splice(str, pos, 0, substr); + } + return str; +} + +/* + * call-seq: * str.index(substring [, offset]) => fixnum or nil * str.index(fixnum [, offset]) => fixnum or nil * str.index(regexp [, offset]) => fixnum or nil @@ -1901,7 +1946,7 @@ { rb_str_t *newstr = str_dup(RSTR(self)); str_concat_string(newstr, str_need_string(other)); - if (OBJ_TAINTED(self) || OBJ_TAINTED(other)) { + if (OBJ_TAINTED(self)) { OBJ_TAINT(newstr); } return (VALUE)newstr; @@ -1995,7 +2040,7 @@ break; default: - str_concat_string(RSTR(self), str_need_string(other)); + rstr_append(self, other); return self; } @@ -4155,6 +4200,7 @@ rb_objc_define_method(rb_cRubyString, "[]", rstr_aref, -1); rb_objc_define_method(rb_cRubyString, "[]=", rstr_aset, -1); rb_objc_define_method(rb_cRubyString, "slice", rstr_aref, -1); + rb_objc_define_method(rb_cRubyString, "insert", rstr_insert, 2); rb_objc_define_method(rb_cRubyString, "index", rstr_index, -1); rb_objc_define_method(rb_cRubyString, "rindex", rstr_rindex, -1); rb_objc_define_method(rb_cRubyString, "+", rstr_plus, 1);

1 0

[3676] MacRuby/branches/icu/string.c
by source_changes＠macosforge.org 03 Mar '10

03 Mar '10

Revision: 3676 http://trac.macosforge.org/projects/ruby/changeset/3676 Author: lsansonetti(a)apple.com Date: 2010-03-02 19:22:13 -0800 (Tue, 02 Mar 2010) Log Message: ----------- added #[]=, fixed a bug in str_splice() Modified Paths: -------------- MacRuby/branches/icu/string.c Modified: MacRuby/branches/icu/string.c =================================================================== --- MacRuby/branches/icu/string.c 2010-03-03 02:55:45 UTC (rev 3675) +++ MacRuby/branches/icu/string.c 2010-03-03 03:22:13 UTC (rev 3676) @@ -768,7 +768,8 @@ bytes_to_add = str->length_in_bytes; } - if (end.end_offset_in_bytes == self->length_in_bytes) { + if (beg.start_offset_in_bytes == end.end_offset_in_bytes + && end.end_offset_in_bytes == self->length_in_bytes) { if (bytes_to_add > 0) { // We are splicing at the very end. memcpy(self->data.bytes + self->length_in_bytes, str->data.bytes, @@ -1159,7 +1160,13 @@ len = slen - beg; } + rstr_modify(self); + str_splice(RSTR(self), beg, len, str_need_string(str), false); + + if (OBJ_TAINTED(str)) { + OBJ_TAINT(self); + } } static VALUE @@ -1636,6 +1643,119 @@ /* * call-seq: + * str[fixnum] = new_str + * str[fixnum, fixnum] = new_str + * str[range] = aString + * str[regexp] = new_str + * str[regexp, fixnum] = new_str + * str[other_str] = new_str + * + * Element Assignment---Replaces some or all of the content of str. The + * portion of the string affected is determined using the same criteria as + * <code>String#[]</code>. If the replacement string is not the same length as + * the text it is replacing, the string will be adjusted accordingly. If the + * regular expression or string is used as the index doesn't match a position + * in the string, <code>IndexError</code> is raised. If the regular expression + * form is used, the optional second <code>Fixnum</code> allows you to specify + * which portion of the match to replace (effectively using the + * <code>MatchData</code> indexing rules. The forms that take a + * <code>Fixnum</code> will raise an <code>IndexError</code> if the value is + * out of range; the <code>Range</code> form will raise a + * <code>RangeError</code>, and the <code>Regexp</code> and <code>String</code> + * forms will silently ignore the assignment. + */ + +static void +rb_str_subpat_set(VALUE str, VALUE re, int nth, VALUE val) +{ + if (rb_reg_search(re, str, 0, false) < 0) { + rb_raise(rb_eIndexError, "regexp not matched"); + } + VALUE match = rb_backref_get(); + + int count = 0; + rb_match_result_t *results = rb_reg_match_results(match, &count); + assert(count > 0); + + if (nth >= count) { +out_of_range: + rb_raise(rb_eIndexError, "index %d out of regexp", nth); + } + if (nth < 0) { + if (-nth >= count) { + goto out_of_range; + } + nth += count; + } + + const long start = results[nth].beg; + if (start == -1) { + rb_raise(rb_eIndexError, "regexp group %d not matched", nth); + } + const long end = results[nth].end; + const long len = end - start; + rstr_splice(str, start, len, val); +} + +static VALUE +rstr_aset(VALUE str, SEL sel, int argc, VALUE *argv) +{ + if (argc == 3) { + if (TYPE(argv[0]) == T_REGEXP) { + rb_str_subpat_set(str, argv[0], NUM2INT(argv[1]), argv[2]); + } + else { + rstr_splice(str, NUM2LONG(argv[0]), NUM2LONG(argv[1]), + argv[2]); + } + return argv[2]; + } + + if (argc != 2) { + rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc); + } + + VALUE indx = argv[0]; + VALUE val = argv[1]; + long pos = 0; + + switch (TYPE(indx)) { + case T_FIXNUM: + pos = FIX2LONG(indx); +num_index: + rstr_splice(str, pos, 1, val); + return val; + + case T_REGEXP: + rb_str_subpat_set(str, indx, 0, val); + return val; + + case T_STRING: + pos = str_index_for_string(RSTR(str), str_need_string(indx), + 0, -1, false, true); + if (pos < 0) { + rb_raise(rb_eIndexError, "string not matched"); + } + rstr_splice(str, pos, rb_str_chars_len(indx), val); + return val; + + default: + /* check if indx is Range */ + { + long beg, len; + if (rb_range_beg_len(indx, &beg, &len, + str_length(RSTR(str), true), 2)) { + rstr_splice(str, beg, len, val); + return val; + } + } + pos = NUM2LONG(indx); + goto num_index; + } +} + +/* + * call-seq: * str.index(substring [, offset]) => fixnum or nil * str.index(fixnum [, offset]) => fixnum or nil * str.index(regexp [, offset]) => fixnum or nil @@ -4033,6 +4153,7 @@ rstr_is_valid_encoding, 0); rb_objc_define_method(rb_cRubyString, "ascii_only?", rstr_is_ascii_only, 0); rb_objc_define_method(rb_cRubyString, "[]", rstr_aref, -1); + rb_objc_define_method(rb_cRubyString, "[]=", rstr_aset, -1); rb_objc_define_method(rb_cRubyString, "slice", rstr_aref, -1); rb_objc_define_method(rb_cRubyString, "index", rstr_index, -1); rb_objc_define_method(rb_cRubyString, "rindex", rstr_rindex, -1);

1 0

[3675] MacRuby/branches/icu/string.c
by source_changes＠macosforge.org 03 Mar '10

03 Mar '10

Revision: 3675 http://trac.macosforge.org/projects/ruby/changeset/3675 Author: lsansonetti(a)apple.com Date: 2010-03-02 18:55:45 -0800 (Tue, 02 Mar 2010) Log Message: ----------- misc bug fixes Modified Paths: -------------- MacRuby/branches/icu/string.c Modified: MacRuby/branches/icu/string.c =================================================================== --- MacRuby/branches/icu/string.c 2010-03-03 02:45:54 UTC (rev 3674) +++ MacRuby/branches/icu/string.c 2010-03-03 02:55:45 UTC (rev 3675) @@ -1215,37 +1215,42 @@ /* * call-seq: - * String.new(str="") => new_str + * str.replace(other_str) => str * - * Returns a new string object containing a copy of str. + * Replaces the contents and taintedness of str with the corresponding + * values in other_str. + * + * s = "hello" #=> "hello" + * s.replace "world" #=> "world" */ static VALUE -rstr_initialize(VALUE self, SEL sel, int argc, VALUE *argv) +rstr_replace(VALUE self, SEL sel, VALUE arg) { - if (argc > 0) { - assert(argc == 1); - str_replace(RSTR(self), argv[0]); + rstr_modify(self); + str_replace(RSTR(self), arg); + if (OBJ_TAINTED(arg)) { + OBJ_TAINT(self); } return self; } /* * call-seq: - * str.replace(other_str) => str + * String.new(str="") => new_str * - * Replaces the contents and taintedness of str with the corresponding - * values in other_str. - * - * s = "hello" #=> "hello" - * s.replace "world" #=> "world" + * Returns a new string object containing a copy of str. */ static VALUE -rstr_replace(VALUE self, SEL sel, VALUE arg) +rstr_initialize(VALUE self, SEL sel, int argc, VALUE *argv) { - rstr_modify(self); - str_replace(RSTR(self), arg); + VALUE orig; + if (argc > 0 && rb_scan_args(argc, argv, "01", &orig) == 1) { + if (self != orig) { + rstr_replace(self, 0, orig); + } + } return self; } @@ -1776,6 +1781,9 @@ { rb_str_t *newstr = str_dup(RSTR(self)); str_concat_string(newstr, str_need_string(other)); + if (OBJ_TAINTED(self) || OBJ_TAINTED(other)) { + OBJ_TAINT(newstr); + } return (VALUE)newstr; }

1 0

[3674] MacRuby/branches/icu/string.c
by source_changes＠macosforge.org 03 Mar '10

03 Mar '10

Revision: 3674 http://trac.macosforge.org/projects/ruby/changeset/3674 Author: lsansonetti(a)apple.com Date: 2010-03-02 18:45:54 -0800 (Tue, 02 Mar 2010) Log Message: ----------- added #chr Modified Paths: -------------- MacRuby/branches/icu/string.c Modified: MacRuby/branches/icu/string.c =================================================================== --- MacRuby/branches/icu/string.c 2010-03-03 02:42:32 UTC (rev 3673) +++ MacRuby/branches/icu/string.c 2010-03-03 02:45:54 UTC (rev 3674) @@ -2691,6 +2691,22 @@ /* * call-seq: + * string.chr -> string + * + * Returns a one-character string at the beginning of the string. + * + * a = "abcde" + * a.chr #=> "a" + */ + +static VALUE +rstr_chr(VALUE str, SEL sel) +{ + return rstr_substr(str, 0, 1); +} + +/* + * call-seq: * str.to_f => float * * Returns the result of interpreting leading characters in str as a @@ -4037,6 +4053,7 @@ rb_objc_define_method(rb_cRubyString, "hex", rstr_hex, 0); rb_objc_define_method(rb_cRubyString, "oct", rstr_oct, 0); rb_objc_define_method(rb_cRubyString, "ord", rstr_ord, 0); + rb_objc_define_method(rb_cRubyString, "chr", rstr_chr, 0); rb_objc_define_method(rb_cRubyString, "to_f", rstr_to_f, 0); rb_objc_define_method(rb_cRubyString, "chomp", rstr_chomp, -1); rb_objc_define_method(rb_cRubyString, "chomp!", rstr_chomp_bang, -1);

1 0

[3673] MacRuby/branches/icu/string.c
by source_changes＠macosforge.org 03 Mar '10

03 Mar '10

Revision: 3673 http://trac.macosforge.org/projects/ruby/changeset/3673 Author: lsansonetti(a)apple.com Date: 2010-03-02 18:42:32 -0800 (Tue, 02 Mar 2010) Log Message: ----------- added #start_with?, #end_with?, improved the substring find primitive to support search ranges Modified Paths: -------------- MacRuby/branches/icu/string.c Modified: MacRuby/branches/icu/string.c =================================================================== --- MacRuby/branches/icu/string.c 2010-03-03 01:37:52 UTC (rev 3672) +++ MacRuby/branches/icu/string.c 2010-03-03 02:42:32 UTC (rev 3673) @@ -938,12 +938,13 @@ static long str_offset_in_bytes_for_string(rb_str_t *self, rb_str_t *searched, - long start_offset_in_bytes, bool backward_search) + long start_offset_in_bytes, long end_offset_in_bytes, + bool backward_search) { if (start_offset_in_bytes >= self->length_in_bytes) { return -1; } - if ((self == searched) && (start_offset_in_bytes == 0)) { + if (self == searched && start_offset_in_bytes == 0) { return 0; } if (searched->length_in_bytes == 0) { @@ -964,8 +965,8 @@ } if (backward_search) { - for (long offset_in_bytes = start_offset_in_bytes; - offset_in_bytes >= 0; + for (long offset_in_bytes = end_offset_in_bytes; + offset_in_bytes >= start_offset_in_bytes; offset_in_bytes -= increment) { if (memcmp(self->data.bytes+offset_in_bytes, searched->data.bytes, searched->length_in_bytes) == 0) { @@ -974,7 +975,7 @@ } } else { - const long max_offset_in_bytes = self->length_in_bytes + const long max_offset_in_bytes = end_offset_in_bytes - searched->length_in_bytes + 1; for (long offset_in_bytes = start_offset_in_bytes; @@ -991,7 +992,7 @@ static long str_index_for_string(rb_str_t *self, rb_str_t *searched, long start_index, - bool backward_search, bool ucs2_mode) + long end_index, bool backward_search, bool ucs2_mode) { str_must_have_compatible_encoding(self, searched); str_make_same_format(self, searched); @@ -1015,8 +1016,28 @@ start_offset_in_bytes = boundaries.start_offset_in_bytes; } - const long offset_in_bytes = str_offset_in_bytes_for_string(RSTR(self), - searched, start_offset_in_bytes, backward_search); + long end_offset_in_bytes; + if (end_index < 0 || end_index == str_length(self, ucs2_mode)) { + end_offset_in_bytes = self->length_in_bytes; + } + else { + character_boundaries_t boundaries = str_get_character_boundaries(self, + end_index, ucs2_mode); + if (boundaries.start_offset_in_bytes == -1) { + if (boundaries.end_offset_in_bytes == -1) { + return -1; + } + else { + // you cannot cut a surrogate in an encoding that is not UTF-16 + str_cannot_cut_surrogate(); + } + } + end_offset_in_bytes = boundaries.end_offset_in_bytes; + } + + const long offset_in_bytes = str_offset_in_bytes_for_string(self, + searched, start_offset_in_bytes, end_offset_in_bytes, + backward_search); if (offset_in_bytes == -1) { return -1; } @@ -1026,7 +1047,8 @@ static bool str_include_string(rb_str_t *self, rb_str_t *searched) { - return (str_offset_in_bytes_for_string(self, searched, 0, false) != -1); + return str_offset_in_bytes_for_string(self, searched, 0, + self->length_in_bytes, false) != -1; } static rb_str_t * @@ -1659,7 +1681,7 @@ // fall through case T_STRING: pos = str_index_for_string(RSTR(self), str_need_string(sub), - pos, false, true); + pos, -1, false, true); break; } @@ -1707,6 +1729,9 @@ if (pos >= len) { pos = len - 1; } + else if (pos == 0) { + return Qnil; + } } else { pos = len - 1; @@ -1722,7 +1747,7 @@ // fall through case T_STRING: pos = str_index_for_string(RSTR(self), str_need_string(sub), - pos, true, true); + 0, pos - 1, true, true); break; } @@ -1968,7 +1993,60 @@ ? Qtrue : Qfalse; } +/* + * call-seq: + * str.start_with?([prefix]+) => true or false + * + * Returns true if str starts with the prefix given. + */ + static VALUE +rstr_start_with(VALUE str, SEL sel, int argc, VALUE *argv) +{ + for (int i = 0; i < argc; i++) { + VALUE tmp = rb_check_string_type(argv[i]); + if (NIL_P(tmp)) { + continue; + } + const long pos = str_index_for_string(RSTR(str), str_need_string(tmp), + 0, rb_str_chars_len(tmp), false, false); + if (pos == 0) { + return Qtrue; + } + } + return Qfalse; +} + +/* + * call-seq: + * str.end_with?([suffix]+) => true or false + * + * Returns true if str ends with the suffix given. + */ + +static VALUE +rstr_end_with(VALUE str, SEL sel, int argc, VALUE *argv) +{ + const long len = rb_str_chars_len(str); + for (int i = 0; i < argc; i++) { + VALUE tmp = rb_check_string_type(argv[i]); + if (NIL_P(tmp)) { + continue; + } + const long sublen = rb_str_chars_len(tmp); + if (sublen > len) { + continue; + } + const long pos = str_index_for_string(RSTR(str), str_need_string(tmp), + len - sublen, len, false, false); + if (pos == len - sublen) { + return Qtrue; + } + } + return Qfalse; +} + +static VALUE rstr_is_stored_in_uchars(VALUE self, SEL sel) { return str_is_stored_in_uchars(RSTR(self)) ? Qtrue : Qfalse; @@ -2428,7 +2506,7 @@ rb_str_t *spat_str = str_need_string(spat); do { const long pos = str_index_for_string(RSTR(str), spat_str, - beg, false, false); + beg, -1, false, false); if (pos == -1) { break; } @@ -2674,7 +2752,7 @@ } else if (rslen <= len) { if (str_index_for_string(RSTR(str), str_need_string(rs), - len - rslen, false, false) >= 0) { + len - rslen, -1, false, false) >= 0) { to_del += rslen; } } @@ -3555,7 +3633,7 @@ long pos = 0; do { - const long off = str_index_for_string(RSTR(str), rs_str, pos, + const long off = str_index_for_string(RSTR(str), rs_str, pos, -1, false, false); long substr_len = 0; @@ -3943,6 +4021,8 @@ rb_objc_define_method(rb_cRubyString, "<=>", rstr_cmp, 1); rb_objc_define_method(rb_cRubyString, "eql?", rstr_eql, 1); rb_objc_define_method(rb_cRubyString, "include?", rstr_includes, 1); + rb_objc_define_method(rb_cRubyString, "start_with?", rstr_start_with, -1); + rb_objc_define_method(rb_cRubyString, "end_with?", rstr_end_with, -1); rb_objc_define_method(rb_cRubyString, "to_s", rstr_to_s, 0); rb_objc_define_method(rb_cRubyString, "to_str", rstr_to_s, 0); rb_objc_define_method(rb_cRubyString, "to_sym", rstr_intern, 0);

1 0

[3672] MacRuby/branches/icu/string.c
by source_changes＠macosforge.org 03 Mar '10

03 Mar '10

Revision: 3672 http://trac.macosforge.org/projects/ruby/changeset/3672 Author: lsansonetti(a)apple.com Date: 2010-03-02 17:37:52 -0800 (Tue, 02 Mar 2010) Log Message: ----------- added #to_f Modified Paths: -------------- MacRuby/branches/icu/string.c Modified: MacRuby/branches/icu/string.c =================================================================== --- MacRuby/branches/icu/string.c 2010-03-03 01:35:59 UTC (rev 3671) +++ MacRuby/branches/icu/string.c 2010-03-03 01:37:52 UTC (rev 3672) @@ -2613,6 +2613,26 @@ /* * call-seq: + * str.to_f => float + * + * Returns the result of interpreting leading characters in str as a + * floating point number. Extraneous characters past the end of a valid number + * are ignored. If there is not a valid number at the start of str, + * <code>0.0</code> is returned. This method never raises an exception. + * + * "123.45e1".to_f #=> 1234.5 + * "45.67 degrees".to_f #=> 45.67 + * "thx1138".to_f #=> 0.0 + */ + +static VALUE +rstr_to_f(VALUE str, SEL sel) +{ + return DOUBLE2NUM(rb_str_to_dbl(str, Qfalse)); +} + +/* + * call-seq: * str.chomp!(separator=$/) => str or nil * * Modifies str in place as described for <code>String#chomp</code>, @@ -3937,6 +3957,7 @@ rb_objc_define_method(rb_cRubyString, "hex", rstr_hex, 0); rb_objc_define_method(rb_cRubyString, "oct", rstr_oct, 0); rb_objc_define_method(rb_cRubyString, "ord", rstr_ord, 0); + rb_objc_define_method(rb_cRubyString, "to_f", rstr_to_f, 0); rb_objc_define_method(rb_cRubyString, "chomp", rstr_chomp, -1); rb_objc_define_method(rb_cRubyString, "chomp!", rstr_chomp_bang, -1); rb_objc_define_method(rb_cRubyString, "sub", rstr_sub, -1);

1 0

[3671] MacRuby/branches/icu/string.c
by source_changes＠macosforge.org 03 Mar '10

03 Mar '10

Revision: 3671 http://trac.macosforge.org/projects/ruby/changeset/3671 Author: lsansonetti(a)apple.com Date: 2010-03-02 17:35:59 -0800 (Tue, 02 Mar 2010) Log Message: ----------- added #try_convert Modified Paths: -------------- MacRuby/branches/icu/string.c Modified: MacRuby/branches/icu/string.c =================================================================== --- MacRuby/branches/icu/string.c 2010-03-03 01:33:12 UTC (rev 3670) +++ MacRuby/branches/icu/string.c 2010-03-03 01:35:59 UTC (rev 3671) @@ -1175,6 +1175,24 @@ /* * call-seq: + * String.try_convert(obj) -> string or nil + * + * Try to convert obj into a String, using to_str method. + * Returns converted regexp or nil if obj cannot be converted + * for any reason. + * + * String.try_convert("str") # => str + * String.try_convert(/re/) # => nil + */ + +static VALUE +rstr_try_convert(VALUE self, SEL sel, VALUE other) +{ + return rb_check_string_type(other); +} + +/* + * call-seq: * String.new(str="") => new_str * * Returns a new string object containing a copy of str. @@ -3873,6 +3891,8 @@ rb_const_set(rb_cObject, rb_intern("String"), rb_cRubyString); rb_objc_define_method(*(VALUE *)rb_cRubyString, "alloc", rstr_alloc, 0); + rb_objc_define_method(*(VALUE *)rb_cRubyString, "try_convert", + rstr_try_convert, 1); rb_objc_define_method(rb_cRubyString, "initialize", rstr_initialize, -1); rb_objc_define_method(rb_cRubyString, "initialize_copy", rstr_replace, 1); rb_objc_define_method(rb_cRubyString, "dup", rstr_dup, 0);

1 0

[3670] MacRuby/branches/icu/string.c
by source_changes＠macosforge.org 03 Mar '10

03 Mar '10

Revision: 3670 http://trac.macosforge.org/projects/ruby/changeset/3670 Author: lsansonetti(a)apple.com Date: 2010-03-02 17:33:12 -0800 (Tue, 02 Mar 2010) Log Message: ----------- forgot rdoc Modified Paths: -------------- MacRuby/branches/icu/string.c Modified: MacRuby/branches/icu/string.c =================================================================== --- MacRuby/branches/icu/string.c 2010-03-03 01:31:59 UTC (rev 3669) +++ MacRuby/branches/icu/string.c 2010-03-03 01:33:12 UTC (rev 3670) @@ -3599,6 +3599,31 @@ return str; } +/* + * call-seq: + * str.succ => new_str + * str.next => new_str + * + * Returns the successor to str. The successor is calculated by + * incrementing characters starting from the rightmost alphanumeric (or + * the rightmost character if there are no alphanumerics) in the + * string. Incrementing a digit always results in another digit, and + * incrementing a letter results in another letter of the same case. + * Incrementing nonalphanumerics uses the underlying character set's + * collating sequence. + * + * If the increment generates a ``carry,'' the character to the left of + * it is incremented. This process repeats until there is no carry, + * adding an additional character if necessary. + * + * "abcd".succ #=> "abce" + * "THX1138".succ #=> "THX1139" + * "<<koala>>".succ #=> "<<koalb>>" + * "1999zzz".succ #=> "2000aaa" + * "ZZZ9999".succ #=> "AAAA0000" + * "***".succ #=> "**+" + */ + static VALUE rstr_succ(VALUE str, SEL sel) { @@ -3671,6 +3696,15 @@ return newstr; } +/* + * call-seq: + * str.succ! => str + * str.next! => str + * + * Equivalent to <code>String#succ</code>, but modifies the receiver in + * place. + */ + static VALUE rstr_succ_bang(VALUE str, SEL sel) {

1 0