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

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

11 Mar '10

Revision: 3739 http://trac.macosforge.org/projects/ruby/changeset/3739 Author: lsansonetti(a)apple.com Date: 2010-03-11 14:27:51 -0800 (Thu, 11 Mar 2010) Log Message: ----------- fixed a bug in #chomp Modified Paths: -------------- MacRuby/branches/icu/string.c Modified: MacRuby/branches/icu/string.c =================================================================== --- MacRuby/branches/icu/string.c 2010-03-11 22:07:20 UTC (rev 3738) +++ MacRuby/branches/icu/string.c 2010-03-11 22:27:51 UTC (rev 3739) @@ -3032,7 +3032,7 @@ } StringValue(rs); - const long len = str_length(RSTR(str), false); + const long len = rb_str_chars_len(str); if (len == 0) { return Qnil; } @@ -3046,7 +3046,7 @@ UChar c = str_get_uchar(RSTR(str), len - 1, false); if (c == '\n') { to_del++; - c = str_get_uchar(RSTR(str), len - 2, false); + c = len > 1 ? str_get_uchar(RSTR(str), len - 2, false) : 0; } if (c == '\r' && (rslen > 0 || to_del != 0)) { to_del++;

1 0

[3738] MacRuby/branches/icu/re.cpp
by source_changes＠macosforge.org 11 Mar '10

11 Mar '10

Revision: 3738 http://trac.macosforge.org/projects/ruby/changeset/3738 Author: lsansonetti(a)apple.com Date: 2010-03-11 14:07:20 -0800 (Thu, 11 Mar 2010) Log Message: ----------- revert latest change Modified Paths: -------------- MacRuby/branches/icu/re.cpp Modified: MacRuby/branches/icu/re.cpp =================================================================== --- MacRuby/branches/icu/re.cpp 2010-03-11 22:01:01 UTC (rev 3737) +++ MacRuby/branches/icu/re.cpp 2010-03-11 22:07:20 UTC (rev 3738) @@ -99,7 +99,7 @@ rb_str_get_uchars(str, &chars, &chars_len, &need_free); - UnicodeString *unistr = new UnicodeString(false, (const UChar *)chars, chars_len); + UnicodeString *unistr = new UnicodeString((const UChar *)chars, chars_len); if (need_free) { free(chars); @@ -132,8 +132,9 @@ sanitize_regexp_string(unistr); + UParseError pe; UErrorCode status = U_ZERO_ERROR; - RegexPattern *pattern = RegexPattern::compile(*unistr, option, status); + RegexPattern *pattern = RegexPattern::compile(*unistr, option, pe, status); if (pattern == NULL) { delete unistr; @@ -149,6 +150,7 @@ regexp_finalize(regexp); regexp->pattern = pattern; regexp->unistr = unistr; + return true; } @@ -561,11 +563,11 @@ if (NIL_P(match) || FL_TEST(match, MATCH_BUSY)) { // Creating a new Match object. match = (VALUE)match_alloc(rb_cMatch, 0); + rb_backref_set(match); res = (rb_match_result_t *)xmalloc(sizeof(rb_match_result_t) * res_count); GC_WB(&RMATCH(match)->results, res); GC_WB(&RMATCH(match)->str, rb_str_new(NULL, 0)); - rb_backref_set(match); } else { // Reusing the previous Match object.

1 0

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

11 Mar '10

Revision: 3737 http://trac.macosforge.org/projects/ruby/changeset/3737 Author: lsansonetti(a)apple.com Date: 2010-03-11 14:01:01 -0800 (Thu, 11 Mar 2010) Log Message: ----------- fixed a memory corruption in #succ Modified Paths: -------------- MacRuby/branches/icu/string.c Modified: MacRuby/branches/icu/string.c =================================================================== --- MacRuby/branches/icu/string.c 2010-03-11 22:00:38 UTC (rev 3736) +++ MacRuby/branches/icu/string.c 2010-03-11 22:01:01 UTC (rev 3737) @@ -2655,6 +2655,8 @@ else { rb_ary_push(ary, scan_result); } + + rb_backref_set(match); } return block_given ? self : ary; @@ -4238,7 +4240,8 @@ "cannot make receiver data as Unicode characters"); } - UChar *chars_buf = (UChar *)malloc(RSTR(str)->length_in_bytes); + UChar *chars_buf = (UChar *)malloc(RSTR(str)->length_in_bytes + + sizeof(UChar)); UChar *chars_ptr = &chars_buf[1]; memcpy(chars_ptr, RSTR(str)->data.uchars, RSTR(str)->length_in_bytes);

1 0

[3736] MacRuby/branches/icu/re.cpp
by source_changes＠macosforge.org 11 Mar '10

11 Mar '10

Revision: 3736 http://trac.macosforge.org/projects/ruby/changeset/3736 Author: lsansonetti(a)apple.com Date: 2010-03-11 14:00:38 -0800 (Thu, 11 Mar 2010) Log Message: ----------- some cleanup Modified Paths: -------------- MacRuby/branches/icu/re.cpp Modified: MacRuby/branches/icu/re.cpp =================================================================== --- MacRuby/branches/icu/re.cpp 2010-03-11 22:00:26 UTC (rev 3735) +++ MacRuby/branches/icu/re.cpp 2010-03-11 22:00:38 UTC (rev 3736) @@ -99,7 +99,7 @@ rb_str_get_uchars(str, &chars, &chars_len, &need_free); - UnicodeString *unistr = new UnicodeString((const UChar *)chars, chars_len); + UnicodeString *unistr = new UnicodeString(false, (const UChar *)chars, chars_len); if (need_free) { free(chars); @@ -132,9 +132,8 @@ sanitize_regexp_string(unistr); - UParseError pe; UErrorCode status = U_ZERO_ERROR; - RegexPattern *pattern = RegexPattern::compile(*unistr, option, pe, status); + RegexPattern *pattern = RegexPattern::compile(*unistr, option, status); if (pattern == NULL) { delete unistr; @@ -150,7 +149,6 @@ regexp_finalize(regexp); regexp->pattern = pattern; regexp->unistr = unistr; - return true; } @@ -563,11 +561,11 @@ if (NIL_P(match) || FL_TEST(match, MATCH_BUSY)) { // Creating a new Match object. match = (VALUE)match_alloc(rb_cMatch, 0); - rb_backref_set(match); res = (rb_match_result_t *)xmalloc(sizeof(rb_match_result_t) * res_count); GC_WB(&RMATCH(match)->results, res); GC_WB(&RMATCH(match)->str, rb_str_new(NULL, 0)); + rb_backref_set(match); } else { // Reusing the previous Match object.

1 0

[3735] MacRuby/branches/icu/object.c
by source_changes＠macosforge.org 11 Mar '10

11 Mar '10

Revision: 3735 http://trac.macosforge.org/projects/ruby/changeset/3735 Author: lsansonetti(a)apple.com Date: 2010-03-11 14:00:26 -0800 (Thu, 11 Mar 2010) Log Message: ----------- fixed rdoc links Modified Paths: -------------- MacRuby/branches/icu/object.c Modified: MacRuby/branches/icu/object.c =================================================================== --- MacRuby/branches/icu/object.c 2010-03-11 04:14:07 UTC (rev 3734) +++ MacRuby/branches/icu/object.c 2010-03-11 22:00:26 UTC (rev 3735) @@ -3093,8 +3093,8 @@ rb_objc_define_method(rb_mKernel, "__native__?", rb_obj_is_native, 0); - rb_objc_define_module_function(rb_mKernel, "sprintf", rb_f_sprintf_imp, -1); /* in sprintf.cpp */ - rb_objc_define_module_function(rb_mKernel, "format", rb_f_sprintf_imp, -1); /* in sprintf.cpp */ + rb_objc_define_module_function(rb_mKernel, "sprintf", rb_f_sprintf_imp, -1); /* in sprintf.c */ + rb_objc_define_module_function(rb_mKernel, "format", rb_f_sprintf_imp, -1); /* in sprintf.c */ rb_objc_define_module_function(rb_mKernel, "Integer", rb_f_integer, -1); rb_objc_define_module_function(rb_mKernel, "Float", rb_f_float, 1);

1 0

[3734] MacRuby/branches/icu/re.cpp
by source_changes＠macosforge.org 11 Mar '10

11 Mar '10

Revision: 3734 http://trac.macosforge.org/projects/ruby/changeset/3734 Author: lsansonetti(a)apple.com Date: 2010-03-10 20:14:07 -0800 (Wed, 10 Mar 2010) Log Message: ----------- some perf improvements Modified Paths: -------------- MacRuby/branches/icu/re.cpp Modified: MacRuby/branches/icu/re.cpp =================================================================== --- MacRuby/branches/icu/re.cpp 2010-03-11 04:13:56 UTC (rev 3733) +++ MacRuby/branches/icu/re.cpp 2010-03-11 04:14:07 UTC (rev 3734) @@ -36,7 +36,7 @@ typedef struct rb_match { struct RBasic basic; rb_regexp_t *regexp; - UnicodeString *unistr; + VALUE str; rb_match_result_t *results; int results_count; } rb_match_t; @@ -60,21 +60,23 @@ NEWOBJ(match, struct rb_match); OBJSETUP(match, klass, T_MATCH); match->regexp = NULL; - match->unistr = NULL; + match->str = 0; + match->results = NULL; + match->results_count = 0; return match; } static void regexp_finalize(rb_regexp_t *regexp) { - if (regexp->unistr != NULL) { - delete regexp->unistr; - regexp->unistr = NULL; - } if (regexp->pattern != NULL) { delete regexp->pattern; regexp->pattern = NULL; } + if (regexp->unistr != NULL) { + delete regexp->unistr; + regexp->unistr = NULL; + } } static IMP regexp_finalize_imp_super = NULL; @@ -88,26 +90,6 @@ } } -static void -match_finalize(rb_match_t *match) -{ - if (match->unistr != NULL) { - delete match->unistr; - match->unistr = NULL; - } -} - -static IMP match_finalize_imp_super = NULL; - -static void -match_finalize_imp(void *rcv, SEL sel) -{ - match_finalize(RMATCH(rcv)); - if (match_finalize_imp_super != NULL) { - ((void(*)(void *, SEL))match_finalize_imp_super)(rcv, sel); - } -} - static UnicodeString * str_to_unistr(VALUE str) { @@ -117,24 +99,14 @@ rb_str_get_uchars(str, &chars, &chars_len, &need_free); - UnicodeString *unistr = new UnicodeString(chars, chars_len); + UnicodeString *unistr = new UnicodeString((const UChar *)chars, chars_len); - if (need_free && chars != NULL) { + if (need_free) { free(chars); } return unistr; } -static VALUE -unistr_subseq(UnicodeString *unistr, int beg, int len) -{ - assert(unistr != NULL); - assert(beg + len <= unistr->length()); - - const UChar *chars = unistr->getBuffer(); - return rb_unicode_str_new(&chars[beg], len); -} - static void sanitize_regexp_string(UnicodeString *unistr) { @@ -570,21 +542,57 @@ RegexMatcher *matcher = RREGEXP(re)->pattern->matcher(*unistr, status); if (matcher == NULL) { + delete unistr; rb_raise(rb_eRegexpError, "can't create matcher: %s", u_errorName(status)); } if (!matcher->find(pos, status)) { - delete unistr; - delete matcher; + // No match. rb_backref_set(Qnil); + delete matcher; + delete unistr; return -1; } + // Match found. const int res_count = 1 + matcher->groupCount(); - rb_match_result_t *res = - (rb_match_result_t *)xmalloc(sizeof(rb_match_result_t) * res_count); + rb_match_result_t *res = NULL; + VALUE match = rb_backref_get(); + if (NIL_P(match) || FL_TEST(match, MATCH_BUSY)) { + // Creating a new Match object. + match = (VALUE)match_alloc(rb_cMatch, 0); + rb_backref_set(match); + res = (rb_match_result_t *)xmalloc(sizeof(rb_match_result_t) + * res_count); + GC_WB(&RMATCH(match)->results, res); + GC_WB(&RMATCH(match)->str, rb_str_new(NULL, 0)); + } + else { + // Reusing the previous Match object. + assert(RMATCH(match)->results != NULL); + if (res_count > RMATCH(match)->results_count) { + res = (rb_match_result_t *)xrealloc(RMATCH(match)->results, + sizeof(rb_match_result_t) * res_count); + if (res != RMATCH(match)->results) { + GC_WB(&RMATCH(match)->results, res); + } + } + else { + res = RMATCH(match)->results; + memset(res, 0, sizeof(rb_match_result_t) * res_count); + } + assert(RMATCH(match)->str != 0); + } + + RMATCH(match)->results_count = res_count; + GC_WB(&RMATCH(match)->regexp, re); + + rb_str_set_len(RMATCH(match)->str, 0); + rb_str_append_uchars(RMATCH(match)->str, unistr->getBuffer(), + unistr->length()); + res[0].beg = matcher->start(status); res[0].end = matcher->end(status); @@ -594,19 +602,8 @@ } delete matcher; + delete unistr; - VALUE match = rb_backref_get(); - if (NIL_P(match) || FL_TEST(match, MATCH_BUSY)) { - match = (VALUE)match_alloc(rb_cMatch, 0); - rb_backref_set(match); - } - - match_finalize(RMATCH(match)); - GC_WB(&RMATCH(match)->regexp, re); - RMATCH(match)->unistr = unistr; - GC_WB(&RMATCH(match)->results, res); - RMATCH(match)->results_count = res_count; - return res[0].beg; } @@ -750,7 +747,7 @@ rb_backref_set(Qnil); return Qfalse; } - const long start = rb_reg_search(rcv, str, 0, 0); + const long start = rb_reg_search(rcv, str, 0, false); if (start < 0) { return Qfalse; } @@ -1098,9 +1095,7 @@ rb_raise(rb_eTypeError, "wrong argument type"); } - match_finalize(RMATCH(rcv)); - - RMATCH(rcv)->unistr = new UnicodeString(*RMATCH(other)->unistr); + GC_WB(&RMATCH(rcv)->str, RMATCH(other)->str); GC_WB(&RMATCH(rcv)->regexp, RMATCH(other)->regexp); const long len = sizeof(rb_match_result_t) * RMATCH(other)->results_count; @@ -1424,7 +1419,7 @@ { assert(RMATCH(rcv)->results_count > 0); - VALUE str = unistr_subseq(RMATCH(rcv)->unistr, 0, + VALUE str = rb_str_substr(RMATCH(rcv)->str, 0, RMATCH(rcv)->results[0].beg); if (OBJ_TAINTED(rcv)) { @@ -1459,8 +1454,8 @@ assert(RMATCH(rcv)->results_count > 0); const int pos = RMATCH(rcv)->results[0].end; - VALUE str = unistr_subseq(RMATCH(rcv)->unistr, pos, - RMATCH(rcv)->unistr->length() - pos); + VALUE str = rb_str_substr(RMATCH(rcv)->str, pos, + rb_str_chars_len(RMATCH(rcv)->str) - pos); if (OBJ_TAINTED(rcv)) { OBJ_TAINT(str); @@ -1539,7 +1534,7 @@ return Qnil; } - return unistr_subseq(RMATCH(match)->unistr, beg, end - beg); + return rb_str_substr(RMATCH(match)->str, beg, end - beg); } VALUE @@ -1585,9 +1580,8 @@ static VALUE match_string(VALUE rcv, SEL sel) { - UnicodeString *unistr = RMATCH(rcv)->unistr; - assert(unistr != NULL); - VALUE str = rb_unicode_str_new(unistr->getBuffer(), unistr->length()); + assert(RMATCH(rcv)->str != 0); + VALUE str = rb_str_dup(RMATCH(rcv)->str); OBJ_FREEZE(str); return str; } @@ -1653,9 +1647,6 @@ rb_objc_define_method(rb_cMatch, "to_s", (void *)match_to_s, 0); rb_objc_define_method(rb_cMatch, "string", (void *)match_string, 0); rb_objc_define_method(rb_cMatch, "inspect", (void *)match_inspect, 0); - - match_finalize_imp_super = rb_objc_install_method2((Class)rb_cMatch, - "finalize", (IMP)match_finalize_imp); } // Compiler primitives.

1 0

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

11 Mar '10

Revision: 3733 http://trac.macosforge.org/projects/ruby/changeset/3733 Author: lsansonetti(a)apple.com Date: 2010-03-10 20:13:56 -0800 (Wed, 10 Mar 2010) Log Message: ----------- fixed a few bugs Modified Paths: -------------- MacRuby/branches/icu/string.c Modified: MacRuby/branches/icu/string.c =================================================================== --- MacRuby/branches/icu/string.c 2010-03-10 22:09:16 UTC (rev 3732) +++ MacRuby/branches/icu/string.c 2010-03-11 04:13:56 UTC (rev 3733) @@ -2647,6 +2647,7 @@ } if (block_given) { + rb_match_busy(match); rb_yield(scan_result); rb_backref_set(match); RETURN_IF_BROKEN(); @@ -3294,7 +3295,8 @@ if (block_given || !NIL_P(hash)) { if (block_given) { - repl = rb_obj_as_string(rb_yield(rb_reg_nth_match(0, match))); + rb_match_busy(match); + repl = rb_obj_as_string(rb_yield(rb_reg_nth_match(0, match))); } else { repl = rb_hash_aref(hash, rstr_substr(str, results[0].beg, @@ -3304,6 +3306,7 @@ rstr_frozen_check(str); if (block_given) { rb_backref_set(match); + RETURN_IF_BROKEN(); } } else { @@ -3429,7 +3432,8 @@ VALUE val; if (block_given || !NIL_P(hash)) { if (block_given) { - val = rb_obj_as_string(rb_yield(rb_reg_nth_match(0, match))); + rb_match_busy(match); + val = rb_obj_as_string(rb_yield(rb_reg_nth_match(0, match))); } else { val = rb_hash_aref(hash, rstr_substr(str, results[0].beg, @@ -3439,6 +3443,7 @@ rstr_frozen_check(str); if (block_given) { rb_backref_set(match); + RETURN_IF_BROKEN(); } } else { @@ -3460,6 +3465,8 @@ if (results[0].beg == offset) { offset++; } + + rb_backref_set(match); } if (bang) {

1 0

[3732] MacRuby/branches/icu
by source_changes＠macosforge.org 10 Mar '10

10 Mar '10

Revision: 3732 http://trac.macosforge.org/projects/ruby/changeset/3732 Author: lsansonetti(a)apple.com Date: 2010-03-10 14:09:16 -0800 (Wed, 10 Mar 2010) Log Message: ----------- misc bugfix Modified Paths: -------------- MacRuby/branches/icu/encoding.h MacRuby/branches/icu/string.c Modified: MacRuby/branches/icu/encoding.h =================================================================== --- MacRuby/branches/icu/encoding.h 2010-03-10 20:32:52 UTC (rev 3731) +++ MacRuby/branches/icu/encoding.h 2010-03-10 22:09:16 UTC (rev 3732) @@ -301,7 +301,7 @@ long rb_str_chars_len(VALUE str); UChar rb_str_get_uchar(VALUE str, long pos); void rb_str_append_uchar(VALUE str, UChar c); -void rb_str_append_uchars(VALUE str, UChar *chars, long len); +void rb_str_append_uchars(VALUE str, const UChar *chars, long len); unsigned long rb_str_hash_uchars(const UChar *chars, long chars_len); long rb_uchar_strtol(UniChar *chars, long chars_len, long pos, long *end_offset); Modified: MacRuby/branches/icu/string.c =================================================================== --- MacRuby/branches/icu/string.c 2010-03-10 20:32:52 UTC (rev 3731) +++ MacRuby/branches/icu/string.c 2010-03-10 22:09:16 UTC (rev 3732) @@ -5766,7 +5766,7 @@ } void -rb_str_append_uchars(VALUE str, UChar *chars, long len) +rb_str_append_uchars(VALUE str, const UChar *chars, long len) { assert(chars != NULL && len >= 0); @@ -5898,7 +5898,7 @@ if (IS_RSTR(str)) { const long len_bytes = str_is_stored_in_uchars(RSTR(str)) ? UCHARS_TO_BYTES(len) : len; - assert(len_bytes < RSTR(str)->length_in_bytes); + assert(len_bytes <= RSTR(str)->length_in_bytes); RSTR(str)->length_in_bytes = len_bytes; } else {

1 0

[3731] MacRuby/trunk/array.c
by source_changes＠macosforge.org 10 Mar '10

10 Mar '10

Revision: 3731 http://trac.macosforge.org/projects/ruby/changeset/3731 Author: lsansonetti(a)apple.com Date: 2010-03-10 12:32:52 -0800 (Wed, 10 Mar 2010) Log Message: ----------- removed unnecessary code (xrealloc will default to xmalloc on leopard or below) Modified Paths: -------------- MacRuby/trunk/array.c Modified: MacRuby/trunk/array.c =================================================================== --- MacRuby/trunk/array.c 2010-03-10 04:39:52 UTC (rev 3730) +++ MacRuby/trunk/array.c 2010-03-10 20:32:52 UTC (rev 3731) @@ -45,19 +45,11 @@ if (rary->cap > 0) { newlen *= 2; } -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 - VALUE *new_elements = (VALUE *)xmalloc(sizeof(VALUE) * newlen); - for (size_t i = 0; i < rary->len; i++) { - GC_WB(&new_elements[i], rary->elements[i]); - } - GC_WB(&ary->elements, new_elements); -#else VALUE *new_elements = xrealloc(rary->elements, sizeof(VALUE) * newlen); if (new_elements != rary->elements) { GC_WB(&rary->elements, new_elements); } -#endif rary->cap = newlen; } }

1 0

[3730] MacRuby/branches/icu/marshal.c
by source_changes＠macosforge.org 10 Mar '10

10 Mar '10

Revision: 3730 http://trac.macosforge.org/projects/ruby/changeset/3730 Author: lsansonetti(a)apple.com Date: 2010-03-09 20:39:52 -0800 (Tue, 09 Mar 2010) Log Message: ----------- optimized Marshal.dump in case an IO object is provided Modified Paths: -------------- MacRuby/branches/icu/marshal.c Modified: MacRuby/branches/icu/marshal.c =================================================================== --- MacRuby/branches/icu/marshal.c 2010-03-10 03:09:42 UTC (rev 3729) +++ MacRuby/branches/icu/marshal.c 2010-03-10 04:39:52 UTC (rev 3730) @@ -220,11 +220,15 @@ { VALUE buf = arg->str; rb_bstr_concat(buf, (const uint8_t *)s, n); +#if 0 // unused if (arg->dest && RSTRING_LEN(buf) >= BUFSIZ) { - if (arg->taint) OBJ_TAINT(buf); + if (arg->taint) { + OBJ_TAINT(buf); + } rb_io_write(arg->dest, 0, buf); rb_str_resize(buf, 0); } +#endif } static void @@ -896,10 +900,12 @@ dump(struct dump_call_arg *arg) { w_object(arg->obj, arg->arg, arg->limit); +#if 0 // unused if (arg->arg->dest) { rb_io_write(arg->arg->dest, 0, arg->arg->str); rb_bstr_resize(arg->arg->str, 0); } +#endif return 0; } @@ -977,16 +983,20 @@ } } arg->dest = 0; + bool got_io = false; if (!NIL_P(port)) { if (!rb_obj_respond_to(port, s_write, Qtrue)) { type_error: rb_raise(rb_eTypeError, "instance of IO needed"); } GC_WB(&arg->str, rb_bstr_new()); +#if 0 // unused GC_WB(&arg->dest, port); +#endif if (rb_obj_respond_to(port, s_binmode, Qtrue)) { rb_funcall2(port, s_binmode, 0, 0); } + got_io = true; } else { port = rb_bstr_new(); @@ -1008,6 +1018,12 @@ rb_ensure(dump, (VALUE)c_arg, dump_ensure, (VALUE)arg); + // If we got an IO object as the port, make sure to write the bytestring + // to it before leaving! + if (got_io) { + rb_io_write(port, 0, arg->str); + } + return port; } @@ -1743,6 +1759,7 @@ v = rb_check_string_type(port); if (!NIL_P(v)) { arg->taint = OBJ_TAINTED(port); /* original taintedness */ + v = rb_str_bstr(v); port = v; } else if (rb_obj_respond_to(port, s_getbyte, Qtrue)

1 0