April 2008 - macruby-changes - lists.macosforge.org

[151] MacRuby/trunk/array.c
by source_changes＠macosforge.org 18 Apr '08

18 Apr '08

Revision: 151 http://trac.macosforge.org/projects/ruby/changeset/151 Author: lsansonetti(a)apple.com Date: 2008-04-17 20:47:56 -0700 (Thu, 17 Apr 2008) Log Message: ----------- better Array#to_a Modified Paths: -------------- MacRuby/trunk/array.c Modified: MacRuby/trunk/array.c =================================================================== --- MacRuby/trunk/array.c 2008-04-18 03:47:40 UTC (rev 150) +++ MacRuby/trunk/array.c 2008-04-18 03:47:56 UTC (rev 151) @@ -102,7 +102,7 @@ } while (0) #endif -static VALUE rb_ary_frozen_p(VALUE ary); +VALUE rb_ary_frozen_p(VALUE ary); static inline void rb_ary_modify_check(VALUE ary) @@ -171,7 +171,7 @@ * while being sorted). */ -static VALUE +VALUE rb_ary_frozen_p(VALUE ary) { #if WITH_OBJC @@ -1747,15 +1747,11 @@ * the receiver to an Array object. */ -#if WITH_OBJC -static bool rb_objc_ary_is_pure(VALUE ary); -#endif - static VALUE rb_ary_to_a(VALUE ary) { #if WITH_OBJC - if (!rb_objc_ary_is_pure(ary)) { + if (rb_obj_is_kind_of(ary, rb_cArray) == Qfalse) { #else if (rb_obj_class(ary) != rb_cArray) { #endif @@ -3795,7 +3791,8 @@ for (i = 0; i < nlen; i++) { rb_ary_store(cc, lev, RARRAY_AT(ary, stack[lev+1])); for (lev++; lev < n; lev++) { - rb_ary_store(cc, lev, RARRAY_AT(ary, stack[lev+1] = stack[lev]+1)); + stack[lev+1] = stack[lev]+1; + rb_ary_store(cc, lev, RARRAY_AT(ary, stack[lev+1])); } #if WITH_OBJC rb_yield(rb_ary_dup(cc));

1 0

[150] MacRuby/trunk
by source_changes＠macosforge.org 18 Apr '08

18 Apr '08

Revision: 150 http://trac.macosforge.org/projects/ruby/changeset/150 Author: lsansonetti(a)apple.com Date: 2008-04-17 20:47:40 -0700 (Thu, 17 Apr 2008) Log Message: ----------- fixing #dup, #clone, implementing freeze/taint state Modified Paths: -------------- MacRuby/trunk/object.c MacRuby/trunk/string.c Modified: MacRuby/trunk/object.c =================================================================== --- MacRuby/trunk/object.c 2008-04-18 02:02:26 UTC (rev 149) +++ MacRuby/trunk/object.c 2008-04-18 03:47:40 UTC (rev 150) @@ -168,6 +168,10 @@ if (rb_hash_tainted(obj)) rb_hash_taint(dest); } + else if (type == T_STRING) { + if (rb_str_tainted(obj)) + rb_str_taint(dest); + } goto call_init_copy; } #endif @@ -254,6 +258,8 @@ return rb_ary_clone(obj); if (type == T_HASH) return rb_hash_clone(obj); + if (type == T_STRING) + return rb_str_clone(obj); clone = rb_obj_alloc(rb_obj_class(obj)); init_copy(clone, obj); return clone; @@ -675,6 +681,18 @@ VALUE rb_obj_tainted(VALUE obj) { +#if WITH_OBJC + if (rb_objc_is_non_native(obj)) { + int type = TYPE(obj); + if (type == T_ARRAY) + return rb_ary_tainted(obj); + if (type == T_HASH) + return rb_hash_tainted(obj); + if (type == T_STRING) + return rb_str_tainted(obj); + return Qfalse; + } +#endif if (OBJ_TAINTED(obj)) return Qtrue; return Qfalse; @@ -802,8 +820,16 @@ rb_obj_frozen_p(VALUE obj) { #if WITH_OBJC - if (rb_objc_is_non_native(obj)) + if (rb_objc_is_non_native(obj)) { + int type = TYPE(obj); + if (type == T_ARRAY) + return rb_ary_frozen_p(obj); + if (type == T_HASH) + return rb_hash_frozen(obj); + if (type == T_STRING) + return rb_str_frozen(obj); return Qfalse; + } #endif if (OBJ_FROZEN(obj)) return Qtrue; if (SPECIAL_CONST_P(obj)) { Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2008-04-18 02:02:26 UTC (rev 149) +++ MacRuby/trunk/string.c 2008-04-18 03:47:40 UTC (rev 150) @@ -99,6 +99,8 @@ struct rb_objc_str_struct { void *cfdata; + bool tainted; + bool frozen; }; /* This variable will always stay NULL, we only use its address. */ @@ -124,6 +126,20 @@ return s; } +static void +rb_objc_str_copy_struct(VALUE old, VALUE new) +{ + struct rb_objc_str_struct *s; + + s = rb_objc_str_get_struct(old); + if (s != NULL) { + struct rb_objc_str_struct *n; + + n = rb_objc_str_get_struct2(new); + memcpy(n, s, sizeof(struct rb_objc_str_struct)); + } +} + static void * rb_str_cfdata(VALUE str) { @@ -1550,20 +1566,58 @@ #endif } +#if WITH_OBJC VALUE rb_str_freeze(VALUE str) { -#if WITH_OBJC - /* TODO */ + rb_objc_str_get_struct2(str)->frozen = true; + return str; +} + +VALUE +rb_str_frozen(VALUE str) +{ + struct rb_objc_str_struct *s; + s = rb_objc_str_get_struct(str); + return s != NULL && s->frozen ? Qtrue : Qfalse; +} + +VALUE +rb_str_taint(VALUE str) +{ + rb_objc_str_get_struct2(str)->tainted = true; + return str; +} + +VALUE +rb_str_tainted(VALUE str) +{ + struct rb_objc_str_struct *s; + s = rb_objc_str_get_struct(str); + return s != NULL && s->tainted ? Qtrue : Qfalse; +} + +VALUE +rb_str_clone(VALUE str) +{ + VALUE dup = rb_str_dup(str); + rb_objc_str_copy_struct(str, dup); + return dup; +} #else + +VALUE +rb_str_freeze(VALUE str) +{ if (STR_ASSOC_P(str)) { VALUE ary = RSTRING(str)->as.heap.aux.shared; OBJ_FREEZE(ary); } return rb_obj_freeze(str); -#endif } +#endif + VALUE rb_str_dup_frozen(VALUE str) { @@ -3559,6 +3613,8 @@ rb_str_modify(str); #if WITH_OBJC rb_str_splice(str, BEG(0), END(0) - BEG(0), repl); + if (rb_obj_tainted(repl)) + rb_str_taint(str); #else rb_enc_associate(str, enc); if (OBJ_TAINTED(repl)) tainted = 1; @@ -3832,6 +3888,8 @@ #if WITH_OBJC rb_str_modify(str); CFStringReplaceAll((CFMutableStringRef)str, (CFStringRef)str2); + if (rb_str_tainted(str2) == Qtrue) + rb_str_taint(str); #else StringValue(str2); len = RSTRING_LEN(str2); @@ -4157,7 +4215,7 @@ rb_str_to_s(VALUE str) { #if WITH_OBJC - if (rb_objc_str_is_pure(str)) { + if (rb_obj_is_kind_of(str, rb_cString) == Qfalse) { #else if (rb_obj_class(str) != rb_cString) { #endif @@ -7632,7 +7690,10 @@ rb_objc_import_class((Class)objc_getClass("NSMutableString")); FL_UNSET(rb_cStringRuby, RCLASS_OBJC_IMPORTED); rb_const_set(rb_cObject, rb_intern("String"), rb_cStringRuby); - /* TODO implement freeze/taint */ + rb_define_method(rb_cString, "taint", rb_str_taint, 0); + rb_define_method(rb_cString, "tainted?", rb_str_tainted, 0); + rb_define_method(rb_cString, "freeze", rb_str_freeze, 0); + rb_define_method(rb_cString, "frozen?", rb_str_frozen, 0); #else rb_cString = rb_define_class("String", rb_cObject); #endif

1 0

[149] MacRuby/trunk/string.c
by source_changes＠macosforge.org 18 Apr '08

18 Apr '08

Revision: 149 http://trac.macosforge.org/projects/ruby/changeset/149 Author: lsansonetti(a)apple.com Date: 2008-04-17 19:02:26 -0700 (Thu, 17 Apr 2008) Log Message: ----------- fixing #dump, #lines Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2008-04-18 01:03:34 UTC (rev 148) +++ MacRuby/trunk/string.c 2008-04-18 02:02:26 UTC (rev 149) @@ -4406,6 +4406,7 @@ OBJ_INFECT(result, str); /* result from dump is ASCII */ rb_enc_associate(result, enc0); + RSTRING_SYNC(result); return result; } @@ -5800,9 +5801,10 @@ #if WITH_OBJC VALUE rs; CFArrayRef ranges; - long i, count, n, l; - UInt8 *buffer; - long bufsize = 0; + long n; + CFStringRef substr; + CFRange sub_range, search_range, res_range; + bool zero_sep; if (rb_scan_args(argc, argv, "01", &rs) == 0) { rs = rb_rs; @@ -5813,33 +5815,50 @@ return str; } StringValue(rs); + zero_sep = CFStringGetLength((CFStringRef)rs) == 0; + if (zero_sep) { + rs = rb_default_rs; + } n = CFStringGetLength((CFStringRef)str); - ranges = CFStringCreateArrayWithFindResults(NULL, (CFStringRef)str, - (CFStringRef)rs, CFRangeMake(0, n), 0); - if (ranges == NULL) { - rb_yield(str); - return str; - } - for (i = l = 0, count = CFArrayGetCount(ranges); i < count; i++) { - CFRange *rs_range; - CFRange sub_range; + search_range = CFRangeMake(0, n); + sub_range = CFRangeMake(0, 0); - rs_range = (CFRange *)CFArrayGetValueAtIndex(ranges, i); - assert(rs_range->location > 0); - sub_range = CFRangeMake(l, rs_range->location - l); -#if 1 - rb_yield((VALUE)CFStringCreateWithSubstring(NULL, (CFStringRef)str, sub_range)); -#else - if (bufsize < sub_range.length) { - bufsize = sub_range.length + 100; - buffer = (UInt8 *)alloca(sub_range.length + 100); +#define YIELD_SUBSTR(range) \ + do { \ + substr = CFStringCreateWithSubstring(NULL, (CFStringRef)str, \ + range); \ + CFMakeCollectable((CFTypeRef)substr); \ + rb_yield((VALUE)substr); \ + } \ + while (0) + + while (CFStringFindWithOptions((CFStringRef)str, (CFStringRef)rs, + search_range, 0, &res_range)) { + if (zero_sep + && sub_range.length > 0 + && sub_range.location + sub_range.length + == res_range.location) { + sub_range.length += res_range.length; + } + else { + if (sub_range.length > 0) + YIELD_SUBSTR(sub_range); + sub_range = CFRangeMake(search_range.location, + res_range.location - search_range.location + res_range.length); } - CFStringGetBytes((CFStringRef)str, sub_range, - kCFStringEncodingUTF8, 0, false, buffer, sub_range.length, NULL); - rb_yield(rb_str_new((const char *)buffer, sub_range.length)); -#endif - l = rs_range->location + rs_range->length; + search_range.location = res_range.location + res_range.length; + search_range.length = n - search_range.location; } + + if (sub_range.length != 0) + YIELD_SUBSTR(sub_range); + + if (search_range.location < n) + YIELD_SUBSTR(CFRangeMake(search_range.location, + n - search_range.location)); + +#undef YIELD_SUBSTR + return str; #else rb_encoding *enc;

1 0

[148] MacRuby/trunk/string.c
by source_changes＠macosforge.org 18 Apr '08

18 Apr '08

Revision: 148 http://trac.macosforge.org/projects/ruby/changeset/148 Author: lsansonetti(a)apple.com Date: 2008-04-17 18:03:34 -0700 (Thu, 17 Apr 2008) Log Message: ----------- fixing #chop, #chomp Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2008-04-18 00:46:06 UTC (rev 147) +++ MacRuby/trunk/string.c 2008-04-18 01:03:34 UTC (rev 148) @@ -6069,12 +6069,23 @@ { #if WITH_OBJC long n; + const char *p; + CFRange r; n = CFStringGetLength((CFStringRef)str); if (n == 0) return Qnil; rb_str_modify(str); - CFStringDelete((CFMutableStringRef)str, CFRangeMake(n - 1, 1)); + p = RSTRING_CPTR(str); + r = CFRangeMake(n - 1, 1); + if (n >= 2 && p[n - 1] == '\n' && p[n - 2] == '\r') { + /* We need this to pass the tests, but this is most probably + * unnecessary. + */ + r.location--; + r.length++; + } + CFStringDelete((CFMutableStringRef)str, r); return str; #else if (RSTRING_LEN(str) > 0) { @@ -6139,7 +6150,8 @@ long n; CFRange range_result; - rb_scan_args(argc, argv, "01", &rs); + if (rb_scan_args(argc, argv, "01", &rs) == 0) + rs = rb_rs; rb_str_modify(str); n = CFStringGetLength((CFStringRef)str); if (NIL_P(rs)) {

1 0

[147] MacRuby/trunk/string.c
by source_changes＠macosforge.org 18 Apr '08

18 Apr '08

Revision: 147 http://trac.macosforge.org/projects/ruby/changeset/147 Author: lsansonetti(a)apple.com Date: 2008-04-17 17:46:06 -0700 (Thu, 17 Apr 2008) Log Message: ----------- fixing #delete, implementing #count, fixing more leaks Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2008-04-17 08:08:28 UTC (rev 146) +++ MacRuby/trunk/string.c 2008-04-18 00:46:06 UTC (rev 147) @@ -138,9 +138,11 @@ return NULL; #if 1 GC_WB(&s->cfdata, (void *)CFDataCreateCopy(NULL, data)); + CFRelease((CFTypeRef)data); #else GC_WB(&s->cfdata, (void *)data); #endif + CFMakeCollectable((CFTypeRef)s->cfdata); } return s->cfdata; } @@ -1447,12 +1449,23 @@ { #if WITH_OBJC long n = CFStringGetLength((CFStringRef)str); + CFStringRef substr; if (beg < 0) beg += n; - if (beg + len > n || beg < 0) + if (beg > n || beg < 0) return Qnil; - return (VALUE)CFStringCreateWithSubstring(NULL, (CFStringRef)str, - CFRangeMake(beg, len)); + if (beg + len > n) + return (VALUE)CFSTR(""); + if (len == 1) { + UniChar c = CFStringGetCharacterAtIndex((CFStringRef)str, beg); + substr = CFStringCreateWithCharacters(NULL, &c, 1); + } + else { + substr = CFStringCreateWithSubstring(NULL, (CFStringRef)str, + CFRangeMake(beg, len)); + } + CFMakeCollectable((CFTypeRef)substr); + return (VALUE)substr; #else VALUE str2 = rb_str_new5(str, RSTRING_PTR(str)+beg, len); @@ -5121,23 +5134,77 @@ if (n == 0) return; - /* TODO this doesn't actually support tokens such as '^e' or 'a-z'. */ for (i = 0, charset = NULL; i < charset_count; i++) { VALUE s = charsets[i]; + bool exclude; + const char *sptr, *p; StringValue(s); - if (charset == NULL) { - charset = CFCharacterSetCreateMutable(NULL); - CFCharacterSetAddCharactersInString( - (CFMutableCharacterSetRef)charset, - (CFStringRef)s); + sptr = RSTRING_CPTR(s); + exclude = sptr[0] == '^'; + + p = NULL; + if (exclude || (p = strchr(sptr, '-')) != NULL) { + CFMutableCharacterSetRef subset; + const char *b, *e; + + b = exclude ? sptr + 1 : sptr; + e = sptr + strlen(sptr) - 1; + subset = CFCharacterSetCreateMutable(NULL); + while (p != NULL) { + if (p > b && *(p - 1) != '\\' && *(p + 1) != '\0') { + CFCharacterSetAddCharactersInRange(subset, + CFRangeMake(*(p - 1), *(p + 1) - *(p - 1) + 1)); + } + if (p > b) { + CFStringRef substr; + substr = CFStringCreateWithBytes(NULL, + (const UInt8 *)b, + (CFIndex)p - (CFIndex)b, + kCFStringEncodingUTF8, + false); + CFCharacterSetAddCharactersInString(subset, substr); + CFRelease(substr); + } + + b = p + 2; + p = strchr(b, '-'); + } + if (b <= e) { + CFStringRef substr; + substr = CFStringCreateWithBytes(NULL, + (const UInt8 *)b, + (CFIndex)e - (CFIndex)b + 1, + kCFStringEncodingUTF8, + false); + CFCharacterSetAddCharactersInString(subset, substr); + CFRelease(substr); + } + + if (exclude) + CFCharacterSetInvert(subset); + + if (charset == NULL) { + charset = subset; + } + else { + CFCharacterSetIntersect(charset, subset); + CFRelease(subset); + } } else { - CFCharacterSetRef subset; - subset = CFCharacterSetCreateWithCharactersInString(NULL, - (CFStringRef)s); - CFCharacterSetIntersect((CFMutableCharacterSetRef)charset, subset); + if (charset == NULL) { + charset = CFCharacterSetCreateMutable(NULL); + CFCharacterSetAddCharactersInString(charset, (CFStringRef)s); + } + else { + CFCharacterSetRef subset; + subset = CFCharacterSetCreateWithCharactersInString(NULL, + (CFStringRef)s); + CFCharacterSetIntersect(charset, subset); + CFRelease(subset); + } } } @@ -5151,6 +5218,8 @@ &result_range)) { (*cb)(&search_range, (const CFRange *)&result_range, str, ctx); } + + CFRelease(charset); } #endif @@ -5402,12 +5471,28 @@ * a.count "ej-m" #=> 4 */ +#if WITH_OBJC +static void +rb_str_count_cb(CFRange *search_range, const CFRange *result_range, + CFStringRef str, void *ctx) +{ + search_range->length -= result_range->length + + (result_range->location - search_range->location); + search_range->location = result_range->location + result_range->length; + (*(int *)ctx) += result_range->length; +} +#endif + static VALUE rb_str_count(int argc, VALUE *argv, VALUE str) { #if WITH_OBJC - /* TODO could share the same logic than #delete */ - rb_notimplement(); + int count; + if (argc < 1) + rb_raise(rb_eArgError, "wrong number of arguments"); + count = 0; + str_charset_find((CFStringRef)str, argv, argc, rb_str_count_cb, &count); + return INT2NUM(count); #else char table[256]; rb_encoding *enc = 0;

1 0

[146] MacRuby/trunk/string.c
by source_changes＠macosforge.org 17 Apr '08

17 Apr '08

Revision: 146 http://trac.macosforge.org/projects/ruby/changeset/146 Author: lsansonetti(a)apple.com Date: 2008-04-17 01:08:28 -0700 (Thu, 17 Apr 2008) Log Message: ----------- fixing #ljust, #rjust, #rindex, #[] (with fixnum arg) Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2008-04-17 07:18:14 UTC (rev 145) +++ MacRuby/trunk/string.c 2008-04-17 08:08:28 UTC (rev 146) @@ -1446,6 +1446,11 @@ rb_str_subseq(VALUE str, long beg, long len) { #if WITH_OBJC + long n = CFStringGetLength((CFStringRef)str); + if (beg < 0) + beg += n; + if (beg + len > n || beg < 0) + return Qnil; return (VALUE)CFStringCreateWithSubstring(NULL, (CFStringRef)str, CFRangeMake(beg, len)); #else @@ -2533,7 +2538,7 @@ CFRange r; return (CFStringFindWithOptions((CFStringRef)str, (CFStringRef)sub, - CFRangeMake(0, pos), + CFRangeMake(0, pos+1), kCFCompareBackwards, &r)) ? r.location : -1; @@ -3057,7 +3062,7 @@ num_index: str = rb_str_substr(str, idx, 1); - if (!NIL_P(str) && RSTRING_LEN(str) == 0) return Qnil; + if (!NIL_P(str) && RSTRING_CLEN(str) == 0) return Qnil; return str; case T_REGEXP: @@ -6802,10 +6807,10 @@ rb_str_justify0(str, pad, floor(width / 2.0), padwidth, 0); } else if (jflag == 'l') { - rb_str_justify0(str, pad, width, padwidth, 0); + rb_str_justify0(str, pad, width, padwidth, n); } else if (jflag == 'r') { - rb_str_justify0(str, pad, width, padwidth, n); + rb_str_justify0(str, pad, width, padwidth, 0); } else { rb_bug("invalid jflag");

1 0

[145] MacRuby/trunk/string.c
by source_changes＠macosforge.org 17 Apr '08

17 Apr '08

Revision: 145 http://trac.macosforge.org/projects/ruby/changeset/145 Author: lsansonetti(a)apple.com Date: 2008-04-17 00:18:14 -0700 (Thu, 17 Apr 2008) Log Message: ----------- fixing String#capitalize Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2008-04-17 01:14:09 UTC (rev 144) +++ MacRuby/trunk/string.c 2008-04-17 07:18:14 UTC (rev 145) @@ -4546,18 +4546,33 @@ rb_str_capitalize_bang(VALUE str) { #if WITH_OBJC + CFStringRef tmp; + long i, n; + bool changed; UniChar c; - CFStringRef tmp; + UniChar *buffer; rb_str_modify(str); - if (CFStringGetLength((CFStringRef)str) == 0) + n = CFStringGetLength((CFStringRef)str); + if (n == 0) return Qnil; - c = CFStringGetCharacterAtIndex((CFStringRef)str, 0); - if (!iswlower(c)) + buffer = (UniChar *)alloca(sizeof(UniChar) * n); + CFStringGetCharacters((CFStringRef)str, CFRangeMake(0, n), buffer); + changed = false; + if (iswlower(buffer[0])) { + buffer[0] = towupper(buffer[0]); + changed = true; + } + for (i = 1; i < n; i++) { + if (iswupper(buffer[i])) { + buffer[i] = towlower(buffer[i]); + changed = true; + } + } + if (!changed) return Qnil; - c = towupper(c); - tmp = CFStringCreateWithCharacters(NULL, &c, 1); - CFStringReplace((CFMutableStringRef)str, CFRangeMake(0, 1), tmp); + tmp = CFStringCreateWithCharacters(NULL, buffer, n); + CFStringReplaceAll((CFMutableStringRef)str, tmp); return str; #else rb_encoding *enc;

1 0

[144] MacRuby/trunk
by source_changes＠macosforge.org 17 Apr '08

17 Apr '08

Revision: 144 http://trac.macosforge.org/projects/ruby/changeset/144 Author: lsansonetti(a)apple.com Date: 2008-04-16 18:14:09 -0700 (Wed, 16 Apr 2008) Log Message: ----------- fixing more regressions, do not leak CF-created objects anymore Modified Paths: -------------- MacRuby/trunk/array.c MacRuby/trunk/bignum.c MacRuby/trunk/compile.c MacRuby/trunk/hash.c MacRuby/trunk/insns.def MacRuby/trunk/parse.y MacRuby/trunk/ruby.c MacRuby/trunk/signal.c MacRuby/trunk/string.c MacRuby/trunk/thread.c MacRuby/trunk/time.c MacRuby/trunk/util.c MacRuby/trunk/variable.c MacRuby/trunk/vm.c MacRuby/trunk/vm_dump.c MacRuby/trunk/vm_insnhelper.c Modified: MacRuby/trunk/array.c =================================================================== --- MacRuby/trunk/array.c 2008-04-16 20:54:11 UTC (rev 143) +++ MacRuby/trunk/array.c 2008-04-17 01:14:09 UTC (rev 144) @@ -225,6 +225,8 @@ if (klass != 0 && klass != rb_cArray && klass != rb_cArrayRuby) *(Class *)ary = RCLASS_OCID(klass); + CFMakeCollectable((CFTypeRef)ary); + return ary; #else NEWOBJ(ary, struct RArray); Modified: MacRuby/trunk/bignum.c =================================================================== --- MacRuby/trunk/bignum.c 2008-04-16 20:54:11 UTC (rev 143) +++ MacRuby/trunk/bignum.c 2008-04-17 01:14:09 UTC (rev 144) @@ -582,10 +582,10 @@ s = StringValueCStr(str); } else { - s = RSTRING_PTR(str); + s = RSTRING_CPTR(str); } if (s) { - len = RSTRING_LEN(str); + len = RSTRING_CLEN(str); if (s[len]) { /* no sentinel somehow */ char *p = ALLOCA_N(char, len+1); @@ -880,8 +880,8 @@ if (FIXNUM_P(x)) { VALUE str = rb_fix2str(x, base); - char* str_ptr = RSTRING_PTR(str); - long str_len = RSTRING_LEN(str); + char* str_ptr = RSTRING_CPTR(str); + long str_len = RSTRING_CLEN(str); if (trim) { if (FIX2INT(x) == 0) return 0; MEMCPY(ptr, str_ptr, char, str_len); @@ -940,7 +940,7 @@ n2 = big2str_find_n1(x, base); n1 = (n2 + 1) / 2; ss = rb_usascii_str_new(0, n2 + 1); /* plus one for sign */ - ptr = RSTRING_PTR(ss); + ptr = RSTRING_PTR(ss); /* ok */ ptr[0] = RBIGNUM_SIGN(x) ? '+' : '-'; hbase = base*base; @@ -960,6 +960,7 @@ ptr[len] = '\0'; rb_str_resize(ss, len); + RSTRING_SYNC(ss); return ss; } Modified: MacRuby/trunk/compile.c =================================================================== --- MacRuby/trunk/compile.c 2008-04-16 20:54:11 UTC (rev 143) +++ MacRuby/trunk/compile.c 2008-04-17 01:14:09 UTC (rev 144) @@ -1025,7 +1025,7 @@ default: dump_disasm_list(FIRST_ELEMENT(anchor)); dump_disasm_list(list); - rb_compile_error(RSTRING_PTR(iseq->filename), line, + rb_compile_error(RSTRING_CPTR(iseq->filename), line, "error: set_sequence"); break; } @@ -1066,7 +1066,7 @@ /* operand check */ if (iobj->operand_size != len - 1) { dump_disasm_list(list); - rb_compile_error(RSTRING_PTR(iseq->filename), iobj->line_no, + rb_compile_error(RSTRING_CPTR(iseq->filename), iobj->line_no, "operand size miss! (%d for %d)", iobj->operand_size, len - 1); return 0; @@ -1081,7 +1081,7 @@ /* label(destination position) */ lobj = (LABEL *)operands[j]; if (lobj->set != Qtrue) { - rb_compile_error(RSTRING_PTR(iseq->filename), iobj->line_no, + rb_compile_error(RSTRING_CPTR(iseq->filename), iobj->line_no, "unknown label"); } if (lobj->sp == -1) { @@ -1106,7 +1106,7 @@ lobj = (LABEL *)(lv & ~1); if (lobj->set != Qtrue) { - rb_compile_error(RSTRING_PTR(iseq->filename), iobj->line_no, + rb_compile_error(RSTRING_CPTR(iseq->filename), iobj->line_no, "unknown label"); } rb_hash_aset(map, obj, INT2FIX(lobj->position - (pos+len))); @@ -1156,7 +1156,7 @@ } break; default: - rb_compile_error(RSTRING_PTR(iseq->filename), iobj->line_no, + rb_compile_error(RSTRING_CPTR(iseq->filename), iobj->line_no, "unknown operand type: %c", type); return 0; } @@ -1225,7 +1225,7 @@ #if 0 /* XXX */ /* this check need dead code elimination */ if (sp != 1) { - rb_bug("SP is not 0 on %s (%d)\n", RSTRING_PTR(iseq->name), sp); + rb_bug("SP is not 0 on %s (%d)\n", RSTRING_CPTR(iseq->name), sp); } #endif @@ -1726,7 +1726,7 @@ dump_disasm_list((LINK_ELEMENT *)iobj); dump_disasm_list((LINK_ELEMENT *)lobj); printf("\n-- %d, %d\n", lobj->sc_state, nstate); - rb_compile_error(RSTRING_PTR(iseq->filename), iobj->lineno, + rb_compile_error(RSTRING_CPTR(iseq->filename), iobj->lineno, "insn_set_sc_state error\n"); return 0; } @@ -1828,7 +1828,7 @@ case SCS_XX: goto normal_insn; default: - rb_compile_error(RSTRING_PTR(iseq->filename), iobj->line_no, + rb_compile_error(RSTRING_CPTR(iseq->filename), iobj->line_no, "unreachable"); } /* remove useless pop */ @@ -2522,7 +2522,7 @@ make_name_for_block(rb_iseq_t *iseq) { if (iseq->parent_iseq == 0) { - return rb_sprintf("block in %s", RSTRING_PTR(iseq->name)); + return rb_sprintf("block in %s", RSTRING_CPTR(iseq->name)); } else { int level = 1; @@ -2531,7 +2531,7 @@ ip = ip->parent_iseq; level++; } - return rb_sprintf("block (%d levels) in %s", level, RSTRING_PTR(ip->name)); + return rb_sprintf("block (%d levels) in %s", level, RSTRING_CPTR(ip->name)); } } @@ -4391,7 +4391,7 @@ LABEL *lfin = NEW_LABEL(nd_line(node)); LABEL *ltrue = NEW_LABEL(nd_line(node)); VALUE key = rb_sprintf("flipflag/%s-%p-%d", - RSTRING_PTR(iseq->name), iseq, + RSTRING_CPTR(iseq->name), iseq, iseq->compile_data->flip_cnt++); iseq_add_mark_object_compile_time(iseq, key); @@ -4770,7 +4770,7 @@ if (sym == symRedo) return CATCH_TYPE_REDO; if (sym == symNext) return CATCH_TYPE_NEXT; rb_raise(rb_eSyntaxError, "invalid exception symbol: %s", - RSTRING_PTR(rb_inspect(sym))); + RSTRING_CPTR(rb_inspect(sym))); return 0; } @@ -4848,12 +4848,12 @@ if (st_lookup(insn_table, insn, &insn_id) == 0) { /* TODO: exception */ RB_GC_GUARD(insn) = rb_inspect(insn); - rb_compile_error(RSTRING_PTR(iseq->filename), line_no, - "unknown instruction: %s", RSTRING_PTR(insn)); + rb_compile_error(RSTRING_CPTR(iseq->filename), line_no, + "unknown instruction: %s", RSTRING_CPTR(insn)); } if (argc != insn_len(insn_id)-1) { - rb_compile_error(RSTRING_PTR(iseq->filename), line_no, + rb_compile_error(RSTRING_CPTR(iseq->filename), line_no, "operand size mismatch"); } Modified: MacRuby/trunk/hash.c =================================================================== --- MacRuby/trunk/hash.c 2008-04-16 20:54:11 UTC (rev 143) +++ MacRuby/trunk/hash.c 2008-04-17 01:14:09 UTC (rev 144) @@ -390,6 +390,8 @@ if (klass != 0 && klass != rb_cHash && klass != rb_cHashRuby) *(Class *)hash = RCLASS_OCID(klass); + CFMakeCollectable((CFTypeRef)hash); + return hash; #else NEWOBJ(hash, struct RHash); Modified: MacRuby/trunk/insns.def =================================================================== --- MacRuby/trunk/insns.def 2008-04-16 20:54:11 UTC (rev 143) +++ MacRuby/trunk/insns.def 2008-04-17 01:14:09 UTC (rev 144) @@ -254,7 +254,7 @@ default: { volatile VALUE tmp = rb_obj_as_string(klass); rb_raise(rb_eTypeError, "%s is not a class/module", - RSTRING_PTR(tmp)); + RSTRING_CPTR(tmp)); } } Modified: MacRuby/trunk/parse.y =================================================================== --- MacRuby/trunk/parse.y 2008-04-16 20:54:11 UTC (rev 143) +++ MacRuby/trunk/parse.y 2008-04-17 01:14:09 UTC (rev 144) @@ -4815,6 +4815,7 @@ } v = (VALUE)CFStringCreateWithSubstring(NULL, (CFStringRef)s, CFRangeMake(beg, lex_gets_ptr - beg)); + CFMakeCollectable((CFTypeRef)v); return v; #else const char *cptr, *beg, *end, *pend; @@ -5396,14 +5397,11 @@ static void dispose_string(VALUE str) { -#if WITH_OBJC - /* TODO: should use another API? */ - CFRelease((CFTypeRef)str); -#else +#if !WITH_OBJC if (RBASIC(str)->flags & RSTRING_NOEMBED) xfree(RSTRING_PTR(str)); - rb_gc_force_recycle(str); #endif + rb_gc_force_recycle(str); } static int @@ -8681,7 +8679,7 @@ err = rb_reg_check_preprocess(str); if (err != Qnil) { err = rb_obj_as_string(err); - compile_error(PARSER_ARG "%s", RSTRING_PTR(err)); + compile_error(PARSER_ARG "%s", RSTRING_CPTR(err)); RB_GC_GUARD(err); } } @@ -8782,7 +8780,7 @@ rb_str_append(rb_str_cat(rb_attr_get(err, mesg), "\n", 1), m); } else { - compile_error(PARSER_ARG "%s", RSTRING_PTR(m)); + compile_error(PARSER_ARG "%s", RSTRING_CPTR(m)); } return Qnil; } @@ -9972,7 +9970,7 @@ parser_initialize(parser); parser->parser_ruby_sourcefile_string = fname2; - parser->parser_ruby_sourcefile = RSTRING_PTR(fname2)+1; + parser->parser_ruby_sourcefile = RSTRING_CPTR(fname2)+1; parser->parser_ruby_sourceline = NIL_P(lineno) ? 0 : NUM2INT(lineno) - 1; return Qnil; @@ -10083,7 +10081,7 @@ { StringValue(msg); if (obj == Qundef) { - rb_raise(rb_eArgError, "%s", RSTRING_PTR(msg)); + rb_raise(rb_eArgError, "%s", RSTRING_CPTR(msg)); } return Qnil; } Modified: MacRuby/trunk/ruby.c =================================================================== --- MacRuby/trunk/ruby.c 2008-04-16 20:54:11 UTC (rev 143) +++ MacRuby/trunk/ruby.c 2008-04-17 01:14:09 UTC (rev 144) @@ -207,10 +207,11 @@ return rb_str_new(s, l); } ret = rb_str_new(0, l + newl - oldl); - ptr = RSTRING_PTR(ret); + ptr = RSTRING_CPTR(ret); /* ok */ memcpy(ptr, newp, newl); memcpy(ptr + newl, s + oldl, l - oldl); ptr[l + newl - oldl] = 0; + RSTRING_SYNC(ret); return ret; } @@ -260,11 +261,12 @@ if (*s) { if (!buf) { buf = rb_str_new(p, len); - p = RSTRING_PTR(buf); + p = RSTRING_CPTR(buf); } else { rb_str_resize(buf, len); - p = strncpy(RSTRING_PTR(buf), p, len); + p = strncpy(RSTRING_PTR(buf), p, len); /* ok */ + RSTRING_SYNC(buf); } } if (cygwin_conv_to_posix_path(p, rubylib) == 0) @@ -301,7 +303,7 @@ static VALUE expand_include_path(VALUE path) { - char *p = RSTRING_PTR(path); + char *p = RSTRING_CPTR(path); if (!p) return path; if (*p == '.' && p[1] == '/') @@ -927,7 +929,7 @@ static int opt_enc_index(VALUE enc_name) { - const char *s = RSTRING_PTR(enc_name); + const char *s = RSTRING_CPTR(enc_name); int i = rb_enc_find_index(s); if (i < 0) { @@ -1159,10 +1161,11 @@ opt->xflag = Qfalse; while (!NIL_P(line = rb_io_gets(f))) { line_start++; - if (RSTRING_LEN(line) > 2 - && RSTRING_PTR(line)[0] == '#' - && RSTRING_PTR(line)[1] == '!') { - if ((p = strstr(RSTRING_PTR(line), "ruby")) != 0) { + const char *lineptr = RSTRING_CPTR(line); + if (RSTRING_CLEN(line) > 2 + && lineptr[0] == '#' + && lineptr[1] == '!') { + if ((p = strstr(lineptr, "ruby")) != 0) { goto start_read; } } @@ -1178,7 +1181,7 @@ if (NIL_P(line)) return 0; - if ((p = strstr(RSTRING_PTR(line), "ruby")) == 0) { + if ((p = strstr(RSTRING_CPTR(line), "ruby")) == 0) { /* not ruby script, kick the program */ char **argv; char *path; @@ -1327,8 +1330,8 @@ if (origarg.argv == 0) rb_raise(rb_eRuntimeError, "$0 not initialized"); StringValue(val); - s = RSTRING_PTR(val); - i = RSTRING_LEN(val); + s = RSTRING_CPTR(val); + i = RSTRING_CLEN(val); #if defined(PSTAT_SETCMD) if (i > PST_CLEN) { union pstun un; Modified: MacRuby/trunk/signal.c =================================================================== --- MacRuby/trunk/signal.c 2008-04-16 20:54:11 UTC (rev 143) +++ MacRuby/trunk/signal.c 2008-04-17 01:14:09 UTC (rev 144) @@ -330,7 +330,7 @@ goto str_signal; case T_STRING: - s = RSTRING_PTR(argv[0]); + s = RSTRING_CPTR(argv[0]); if (s[0] == '-') { negative++; s++; @@ -351,7 +351,7 @@ str = rb_check_string_type(argv[0]); if (!NIL_P(str)) { - s = RSTRING_PTR(str); + s = RSTRING_CPTR(str); goto str_signal; } rb_raise(rb_eArgError, "bad signal type %s", @@ -719,40 +719,40 @@ goto sig_ign; break; case 14: - if (strncmp(RSTRING_PTR(command), "SYSTEM_DEFAULT", 14) == 0) { + if (strncmp(RSTRING_CPTR(command), "SYSTEM_DEFAULT", 14) == 0) { func = SIG_DFL; *cmd = 0; } break; case 7: - if (strncmp(RSTRING_PTR(command), "SIG_IGN", 7) == 0) { + if (strncmp(RSTRING_CPTR(command), "SIG_IGN", 7) == 0) { sig_ign: func = SIG_IGN; *cmd = 0; } - else if (strncmp(RSTRING_PTR(command), "SIG_DFL", 7) == 0) { + else if (strncmp(RSTRING_CPTR(command), "SIG_DFL", 7) == 0) { sig_dfl: func = default_handler(sig); *cmd = 0; } - else if (strncmp(RSTRING_PTR(command), "DEFAULT", 7) == 0) { + else if (strncmp(RSTRING_CPTR(command), "DEFAULT", 7) == 0) { goto sig_dfl; } break; case 6: - if (strncmp(RSTRING_PTR(command), "IGNORE", 6) == 0) { + if (strncmp(RSTRING_CPTR(command), "IGNORE", 6) == 0) { goto sig_ign; } break; case 4: - if (strncmp(RSTRING_PTR(command), "EXIT", 4) == 0) { + if (strncmp(RSTRING_CPTR(command), "EXIT", 4) == 0) { func = sighandler; *cmd = Qundef; } break; } if (func == wrong_trap) { - rb_raise(rb_eArgError, "wrong trap - %s", RSTRING_PTR(command)); + rb_raise(rb_eArgError, "wrong trap - %s", RSTRING_CPTR(command)); } } else { Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2008-04-16 20:54:11 UTC (rev 143) +++ MacRuby/trunk/string.c 2008-04-17 01:14:09 UTC (rev 144) @@ -444,6 +444,7 @@ if (klass != 0 && klass != rb_cString && klass != rb_cStringRuby && klass != rb_cSymbol) *(Class *)str = RCLASS_OCID(klass); + CFMakeCollectable((CFTypeRef)str); #else NEWOBJ(str, struct RString); OBJSETUP(str, klass, T_STRING); @@ -3805,7 +3806,7 @@ * s.replace "world" #=> "world" */ -static VALUE +VALUE rb_str_replace(VALUE str, VALUE str2) { long len; Modified: MacRuby/trunk/thread.c =================================================================== --- MacRuby/trunk/thread.c 2008-04-16 20:54:11 UTC (rev 143) +++ MacRuby/trunk/thread.c 2008-04-17 01:14:09 UTC (rev 144) @@ -440,7 +440,7 @@ if (!proc || !RTEST(loc = rb_proc_location(proc))) { rb_raise(rb_eThreadError, "already initialized thread"); } - file = RSTRING_PTR(RARRAY_AT(loc, 0)); + file = RSTRING_CPTR(RARRAY_AT(loc, 0)); if (NIL_P(line = RARRAY_AT(loc, 1))) { rb_raise(rb_eThreadError, "already initialized thread - %s", file); Modified: MacRuby/trunk/time.c =================================================================== --- MacRuby/trunk/time.c 2008-04-16 20:54:11 UTC (rev 143) +++ MacRuby/trunk/time.c 2008-04-17 01:14:09 UTC (rev 144) @@ -418,14 +418,14 @@ if (!NIL_P(s)) { tm->tm_mon = -1; for (i=0; i<12; i++) { - if (RSTRING_LEN(s) == 3 && - STRCASECMP(months[i], RSTRING_PTR(s)) == 0) { + if (RSTRING_CLEN(s) == 3 && + STRCASECMP(months[i], RSTRING_CPTR(s)) == 0) { tm->tm_mon = i; break; } } if (tm->tm_mon == -1) { - char c = RSTRING_PTR(s)[0]; + char c = RSTRING_CPTR(s)[0]; if ('0' <= c && c <= '9') { tm->tm_mon = obj2long(s)-1; @@ -2082,8 +2082,8 @@ rb_raise(rb_eArgError, "format should have ASCII compatible encoding"); } format = rb_str_new4(format); - fmt = RSTRING_PTR(format); - len = RSTRING_LEN(format); + fmt = RSTRING_CPTR(format); + len = RSTRING_CLEN(format); if (len == 0) { rb_warning("strftime called with empty format string"); } @@ -2106,7 +2106,7 @@ return str; } else { - len = rb_strftime(&buf, RSTRING_PTR(format), &tobj->tm); + len = rb_strftime(&buf, RSTRING_CPTR(format), &tobj->tm); } str = rb_str_new(buf, len); if (buf != buffer) free(buf); @@ -2226,7 +2226,7 @@ rb_copy_generic_ivar(time, str); StringValue(str); - buf = (unsigned char *)RSTRING_PTR(str); + buf = (unsigned char *)RSTRING_PTR(str); /* ok */ if (RSTRING_LEN(str) != 8) { rb_raise(rb_eTypeError, "marshaled time format differ"); } Modified: MacRuby/trunk/util.c =================================================================== --- MacRuby/trunk/util.c 2008-04-16 20:54:11 UTC (rev 143) +++ MacRuby/trunk/util.c 2008-04-17 01:14:09 UTC (rev 144) @@ -290,7 +290,7 @@ #if defined(DJGPP) if (_USE_LFN) return; #else - if (valid_filename(RSTRING_PTR(str))) return; + if (valid_filename(RSTRING_CPTR(str))) return; #endif /* Fooey, style 0 failed. Fix str before continuing. */ @@ -298,7 +298,7 @@ #endif slen = extlen; - t = buf; baselen = 0; s = RSTRING_PTR(str); + t = buf; baselen = 0; s = RSTRING_CPTR(str); while ((*t = *s) && *s != '.') { baselen++; if (*s == '\\' || *s == '/') baselen = 0; @@ -335,8 +335,7 @@ fallback: (void)memcpy(p, strEQ(ext, suffix1) ? suffix2 : suffix1, 5); } - rb_str_resize(str, strlen(buf)); - memcpy(RSTRING_PTR(str), buf, RSTRING_LEN(str)); + rb_str_replace(str, rb_str_new(buf, strlen(buf))); } #if defined(__CYGWIN32__) || defined(_WIN32) Modified: MacRuby/trunk/variable.c =================================================================== --- MacRuby/trunk/variable.c 2008-04-16 20:54:11 UTC (rev 143) +++ MacRuby/trunk/variable.c 2008-04-17 01:14:09 UTC (rev 144) @@ -232,7 +232,7 @@ OBJ_FREEZE(str); rb_ivar_set(klass, classpath, str); #if WITH_OBJC - rb_objc_rename_class(klass, RSTRING_PTR(str)); + rb_objc_rename_class(klass, RSTRING_CPTR(str)); #endif } @@ -287,7 +287,7 @@ char * rb_class2name(VALUE klass) { - return RSTRING_PTR(rb_class_name(klass)); + return RSTRING_CPTR(rb_class_name(klass)); } char * @@ -1341,7 +1341,7 @@ #endif RDATA(av)->dfree != (RUBY_DATA_FUNC)st_free_table) { VALUE desc = rb_inspect(av); - rb_raise(rb_eTypeError, "wrong autoload table: %s", RSTRING_PTR(desc)); + rb_raise(rb_eTypeError, "wrong autoload table: %s", RSTRING_CPTR(desc)); } return (struct st_table *)DATA_PTR(av); } @@ -1413,7 +1413,7 @@ VALUE file; NODE *load = autoload_delete(klass, id); - if (!load || !(file = load->nd_lit) || rb_provided(RSTRING_PTR(file))) { + if (!load || !(file = load->nd_lit) || rb_provided(RSTRING_CPTR(file))) { return Qfalse; } return rb_require_safe(file, load->nd_nth); @@ -1432,10 +1432,10 @@ } file = ((NODE *)load)->nd_lit; Check_Type(file, T_STRING); - if (!RSTRING_PTR(file)) { + if (RSTRING_CLEN(file) == 0) { rb_raise(rb_eArgError, "empty file name"); } - if (!rb_provided(RSTRING_PTR(file))) { + if (!rb_provided(RSTRING_CPTR(file))) { return file; } Modified: MacRuby/trunk/vm.c =================================================================== --- MacRuby/trunk/vm.c 2008-04-16 20:54:11 UTC (rev 143) +++ MacRuby/trunk/vm.c 2008-04-17 01:14:09 UTC (rev 144) @@ -721,7 +721,7 @@ vm_backtrace_each(rb_thread_t *th, rb_control_frame_t *limit_cfp, rb_control_frame_t *cfp, - char *file, int line_no, VALUE ary) + const char *file, int line_no, VALUE ary) { VALUE str; @@ -732,9 +732,9 @@ rb_iseq_t *iseq = cfp->iseq; line_no = vm_get_sourceline(cfp); - file = RSTRING_PTR(iseq->filename); + file = RSTRING_CPTR(iseq->filename); str = rb_sprintf("%s:%d:in `%s'", - file, line_no, RSTRING_PTR(iseq->name)); + file, line_no, RSTRING_CPTR(iseq->name)); rb_ary_push(ary, str); } } @@ -1409,14 +1409,14 @@ if (cfp->pc != 0) { rb_iseq_t *iseq = cfp->iseq; int line_no = vm_get_sourceline(cfp); - char *file = RSTRING_PTR(iseq->filename); + const char *file = RSTRING_CPTR(iseq->filename); str = rb_sprintf("%s:%d:in `%s'", - file, line_no, RSTRING_PTR(iseq->name)); + file, line_no, RSTRING_CPTR(iseq->name)); } } else if (cfp->method_id) { str = rb_sprintf("`%s#%s' (cfunc)", - RSTRING_PTR(rb_class_name(cfp->method_class)), + RSTRING_CPTR(rb_class_name(cfp->method_class)), rb_id2name(cfp->method_id)); } Modified: MacRuby/trunk/vm_dump.c =================================================================== --- MacRuby/trunk/vm_dump.c 2008-04-16 20:54:11 UTC (rev 143) +++ MacRuby/trunk/vm_dump.c 2008-04-17 01:14:09 UTC (rev 144) @@ -98,11 +98,11 @@ } else { pc = cfp->pc - cfp->iseq->iseq_encoded; - iseq_name = RSTRING_PTR(cfp->iseq->name); + iseq_name = RSTRING_CPTR(cfp->iseq->name); line = vm_get_sourceline(cfp); if (line) { char fn[MAX_POSBUF+1]; - snprintf(fn, MAX_POSBUF, "%s", RSTRING_PTR(cfp->iseq->filename)); + snprintf(fn, MAX_POSBUF, "%s", RSTRING_CPTR(cfp->iseq->filename)); snprintf(posbuf, MAX_POSBUF, "%s:%d", fn, line); } } @@ -257,7 +257,7 @@ else { argc = iseq->argc; local_size = iseq->local_size; - name = RSTRING_PTR(iseq->name); + name = RSTRING_CPTR(iseq->name); } /* stack trace header */ Modified: MacRuby/trunk/vm_insnhelper.c =================================================================== --- MacRuby/trunk/vm_insnhelper.c 2008-04-16 20:54:11 UTC (rev 143) +++ MacRuby/trunk/vm_insnhelper.c 2008-04-17 01:14:09 UTC (rev 144) @@ -1045,7 +1045,7 @@ break; default: rb_raise(rb_eTypeError, "%s is not a class/module", - RSTRING_PTR(rb_obj_as_string(klass))); + RSTRING_CPTR(rb_obj_as_string(klass))); } if (is_defined) { return rb_const_defined(klass, id);

1 0

[143] MacRuby/trunk/parse.y
by source_changes＠macosforge.org 16 Apr '08

16 Apr '08

Revision: 143 http://trac.macosforge.org/projects/ruby/changeset/143 Author: lsansonetti(a)apple.com Date: 2008-04-16 13:54:11 -0700 (Wed, 16 Apr 2008) Log Message: ----------- fixing heredoc parsing Modified Paths: -------------- MacRuby/trunk/parse.y Modified: MacRuby/trunk/parse.y =================================================================== --- MacRuby/trunk/parse.y 2008-04-16 19:20:43 UTC (rev 142) +++ MacRuby/trunk/parse.y 2008-04-16 20:54:11 UTC (rev 143) @@ -5631,6 +5631,11 @@ func |= str_xquote; quoted: newtok(); +#if WITH_OBJC + /* avoid null character which will force bytestring creation */ + if (func == 0) + func = '\1'; +#endif tokadd(func); term = c; while ((c = nextc()) != -1 && c != term) { @@ -5726,8 +5731,8 @@ long len; VALUE str = 0; - eos = RSTRING_PTR(here->nd_lit); - len = RSTRING_LEN(here->nd_lit) - 1; + eos = RSTRING_CPTR(here->nd_lit); + len = RSTRING_CLEN(here->nd_lit) - 1; indent = (func = *eos++) & STR_FUNC_INDENT; if ((c = nextc()) == -1) { @@ -5745,7 +5750,7 @@ if (!(func & STR_FUNC_EXPAND)) { do { - p = RSTRING_PTR(lex_lastline); + p = RSTRING_CPTR(lex_lastline); pend = lex_pend; if (pend > p) { switch (pend[-1]) { @@ -5761,7 +5766,11 @@ if (str) rb_str_cat(str, p, pend - p); else +#if WITH_OBJC + str = STR_NEW(p, 0); /* avoid bytestring */ +#else str = STR_NEW(p, pend - p); +#endif if (pend < lex_pend) rb_str_cat(str, "\n", 1); lex_goto_eol(parser); if (nextc() == -1) {

1 0

[142] MacRuby/trunk/string.c
by source_changes＠macosforge.org 16 Apr '08

16 Apr '08

Revision: 142 http://trac.macosforge.org/projects/ruby/changeset/142 Author: lsansonetti(a)apple.com Date: 2008-04-16 12:20:43 -0700 (Wed, 16 Apr 2008) Log Message: ----------- fixing String#reverse Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2008-04-16 19:11:52 UTC (rev 141) +++ MacRuby/trunk/string.c 2008-04-16 19:20:43 UTC (rev 142) @@ -3954,15 +3954,12 @@ if (n <= 1) return rb_str_dup(str); - buffer = (UniChar *)CFStringGetCharactersPtr((CFStringRef)str); - if (buffer == NULL) { - buffer = (UniChar *)alloca(sizeof(UniChar) * n); - CFStringGetCharacters((CFStringRef)buffer, CFRangeMake(0, n), buffer); - } + buffer = (UniChar *)alloca(sizeof(UniChar) * n); + CFStringGetCharacters((CFStringRef)str, CFRangeMake(0, n), buffer); for (i = 0; i < (n / 2); i++) { UniChar c = buffer[i]; - buffer[i] = buffer[n - i]; - buffer[n - i] = c; + buffer[i] = buffer[n - i - 1]; + buffer[n - i - 1] = c; } CFStringDelete((CFMutableStringRef)str, CFRangeMake(0, n)); CFStringAppendCharacters((CFMutableStringRef)str, (const UniChar *)buffer, n); @@ -4003,7 +4000,7 @@ { #if WITH_OBJC VALUE obj = rb_str_dup(str); - rb_str_reverse_bang(rb_str_dup(str)); + rb_str_reverse_bang(obj); return obj; #else rb_encoding *enc;

1 0