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

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

22 Apr '08

Revision: 161 http://trac.macosforge.org/projects/ruby/changeset/161 Author: lsansonetti(a)apple.com Date: 2008-04-22 14:16:39 -0700 (Tue, 22 Apr 2008) Log Message: ----------- retain symbol strings Modified Paths: -------------- MacRuby/trunk/parse.y Modified: MacRuby/trunk/parse.y =================================================================== --- MacRuby/trunk/parse.y 2008-04-22 01:04:23 UTC (rev 160) +++ MacRuby/trunk/parse.y 2008-04-22 21:16:39 UTC (rev 161) @@ -8958,7 +8958,7 @@ 0, NULL, NULL); GC_ROOT(&global_symbols.sym_id); global_symbols.id_str = CFDictionaryCreateMutable(NULL, - 0, NULL, NULL); + 0, NULL, &kCFTypeDictionaryValueCallBacks); GC_ROOT(&global_symbols.id_str); global_symbols.op_sym = xmalloc(sizeof(VALUE) * tLAST_TOKEN); GC_ROOT(&global_symbols.op_sym);

1 0

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

22 Apr '08

Revision: 160 http://trac.macosforge.org/projects/ruby/changeset/160 Author: lsansonetti(a)apple.com Date: 2008-04-21 18:04:23 -0700 (Mon, 21 Apr 2008) Log Message: ----------- fixing #succ + misc things Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2008-04-21 21:43:26 UTC (rev 159) +++ MacRuby/trunk/string.c 2008-04-22 01:04:23 UTC (rev 160) @@ -149,6 +149,15 @@ } static void * +rb_str_cfdata2(VALUE str) +{ + struct rb_objc_str_struct *s; + + s = rb_objc_str_get_struct2(str); + return s != NULL ? s->cfdata : NULL; +} + +static void * rb_str_cfdata(VALUE str) { struct rb_objc_str_struct *s; @@ -192,17 +201,19 @@ rb_str_bytesync(VALUE str) { CFDataRef data; - CFIndex datalen; - data = (CFDataRef)rb_str_cfdata(str); - datalen = CFDataGetLength(data); - CFStringRef bytestr = CFStringCreateWithBytesNoCopy( - NULL, - CFDataGetBytePtr((CFDataRef)data), - datalen, - kCFStringEncodingUTF8, - false, - kCFAllocatorNull); - CFStringReplaceAll((CFMutableStringRef)str, (CFStringRef)bytestr); + data = (CFDataRef)rb_str_cfdata2(str); + if (data != NULL) { + CFIndex datalen; + datalen = CFDataGetLength(data); + CFStringRef bytestr = CFStringCreateWithBytesNoCopy( + NULL, + CFDataGetBytePtr((CFDataRef)data), + datalen, + kCFStringEncodingUTF8, + false, + kCFAllocatorNull); + CFStringReplaceAll((CFMutableStringRef)str, (CFStringRef)bytestr); + } } VALUE @@ -837,7 +848,8 @@ rb_str_shared_replace(VALUE str, VALUE str2) { #if WITH_OBJC - rb_notimplement(); + rb_str_modify(str); + CFStringReplaceAll((CFMutableStringRef)str, (CFStringRef)str2); #else rb_encoding *enc; int cr; @@ -2984,9 +2996,6 @@ VALUE rb_str_succ(VALUE orig) { -#if WITH_OBJC - rb_notimplement(); -#else rb_encoding *enc; VALUE str; char *sbeg, *s, *e; @@ -2995,10 +3004,12 @@ char carry[ONIGENC_CODE_TO_MBC_MAXLEN] = "\1"; int carry_pos = 0, carry_len = 1; - str = rb_str_new5(orig, RSTRING_PTR(orig), RSTRING_LEN(orig)); + str = rb_str_new5(orig, RSTRING_CPTR(orig), RSTRING_CLEN(orig)); +#if !WITH_OBJC rb_enc_cr_str_copy_for_substr(str, orig); OBJ_INFECT(str, orig); - if (RSTRING_LEN(str) == 0) return str; +#endif + if (RSTRING_CLEN(str) == 0) return str; enc = STR_ENC_GET(orig); sbeg = RSTRING_PTR(str); @@ -3010,8 +3021,10 @@ neighbor = enc_succ_alnum_char(s, l, enc, carry); if (neighbor == NEIGHBOR_NOT_CHAR) continue; - if (neighbor == NEIGHBOR_FOUND) + if (neighbor == NEIGHBOR_FOUND) { + RSTRING_SYNC(str); return str; + } c = 1; carry_pos = s - sbeg; carry_len = l; @@ -3022,8 +3035,10 @@ enum neighbor_char neighbor; if ((l = rb_enc_precise_mbclen(s, e, enc)) <= 0) continue; neighbor = enc_succ_char(s, l, enc); - if (neighbor == NEIGHBOR_FOUND) - return str; + if (neighbor == NEIGHBOR_FOUND) { + RSTRING_SYNC(str); + return str; + } if (rb_enc_precise_mbclen(s, s+l, enc) != l) { /* wrapped to \0...\0. search next valid char. */ enc_succ_char(s, l, enc); @@ -3035,6 +3050,14 @@ carry_pos = s - sbeg; } } +#if WITH_OBJC + CFMutableDataRef data = (CFMutableDataRef)rb_str_cfdata(str); + CFDataSetLength(data, RSTRING_LEN(str) + carry_len); + s = (char *)CFDataGetMutableBytePtr(data); + memmove(s + carry_len, s, RSTRING_LEN(str) - carry_pos); + memmove(s, carry, carry_len); + RSTRING_SYNC(str); +#else RESIZE_CAPA(str, RSTRING_LEN(str) + carry_len); s = RSTRING_PTR(str) + carry_pos; memmove(s + carry_len, s, RSTRING_LEN(str) - carry_pos); @@ -3042,8 +3065,8 @@ STR_SET_LEN(str, RSTRING_LEN(str) + carry_len); RSTRING_PTR(str)[RSTRING_LEN(str)] = '\0'; rb_enc_str_coderange(str); +#endif return str; -#endif } @@ -3100,10 +3123,10 @@ succ = rb_intern("succ"); StringValue(end); enc = rb_enc_check(beg, end); - if (RSTRING_LEN(beg) == 1 && RSTRING_LEN(end) == 1 && + if (RSTRING_CLEN(beg) == 1 && RSTRING_CLEN(end) == 1 && is_ascii_string(beg) && is_ascii_string(end)) { - char c = RSTRING_PTR(beg)[0]; - char e = RSTRING_PTR(end)[0]; + char c = RSTRING_CPTR(beg)[0]; + char e = RSTRING_CPTR(end)[0]; if (c > e || (excl && c == e)) return beg; for (;;) { @@ -3125,7 +3148,7 @@ current = rb_funcall(current, succ, 0, 0); StringValue(current); if (excl && rb_str_equal(current, end)) break; - if (RSTRING_LEN(current) > RSTRING_LEN(end) || RSTRING_LEN(current) == 0) + if (RSTRING_CLEN(current) > RSTRING_CLEN(end) || RSTRING_CLEN(current) == 0) break; } @@ -3635,7 +3658,7 @@ #endif rb_str_modify(str); #if WITH_OBJC - rb_str_splice(str, BEG(0), END(0) - BEG(0), repl); + rb_str_splice_0(str, BEG(0), END(0) - BEG(0), repl); if (rb_obj_tainted(repl)) rb_str_taint(str); #else @@ -5913,9 +5936,6 @@ static VALUE rb_str_split_m(int argc, VALUE *argv, VALUE str) { -#if 0//WITH_OBJC - rb_notimplement(); -#else rb_encoding *enc; VALUE spat; VALUE limit; @@ -6073,7 +6093,6 @@ } return result; -#endif } VALUE

1 0

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

21 Apr '08

Revision: 159 http://trac.macosforge.org/projects/ruby/changeset/159 Author: lsansonetti(a)apple.com Date: 2008-04-21 14:43:26 -0700 (Mon, 21 Apr 2008) Log Message: ----------- implementing #tr & #tr_s Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2008-04-19 09:01:14 UTC (rev 158) +++ MacRuby/trunk/string.c 2008-04-21 21:43:26 UTC (rev 159) @@ -4884,10 +4884,344 @@ } static VALUE rb_str_delete_bang(int,VALUE*,VALUE); +#endif +#if WITH_OBJC +typedef void str_charset_find_cb +(CFRange *, const CFRange *, CFStringRef, UniChar, void *); + +static void +str_charset_find(CFStringRef str, VALUE *charsets, int charset_count, + bool squeeze_mode, str_charset_find_cb *cb, void *ctx) +{ + int i; + long n; + bool changed; + CFMutableCharacterSetRef charset; + CFRange search_range, result_range; + + if (charset_count == 0) + return; + + n = CFStringGetLength((CFStringRef)str); + if (n == 0) + return; + + for (i = 0, charset = NULL; i < charset_count; i++) { + VALUE s = charsets[i]; + bool exclude; + const char *sptr, *p; + + StringValue(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 { + if (charset == NULL) { + charset = CFCharacterSetCreateMutable(NULL); + CFCharacterSetAddCharactersInString(charset, (CFStringRef)s); + } + else { + CFCharacterSetRef subset; + subset = CFCharacterSetCreateWithCharactersInString(NULL, + (CFStringRef)s); + CFCharacterSetIntersect(charset, subset); + CFRelease(subset); + } + } + } + + search_range = CFRangeMake(0, n); +#if 0 + while (search_range.length != 0 + && CFStringFindCharacterFromSet( + (CFStringRef)str, + (CFCharacterSetRef)charset, + search_range, + 0, + &result_range)) { + (*cb)(&search_range, (const CFRange *)&result_range, str, ctx); + } +#else + CFStringInlineBuffer buf; + UniChar previous_char = 0; + CFStringInitInlineBuffer((CFStringRef)str, &buf, search_range); + do { + long i; + bool mutated = false; + + if (search_range.location + search_range.length < n) { + n = search_range.location + search_range.length; + CFStringInitInlineBuffer((CFStringRef)str, &buf, CFRangeMake(0, n)); + } + + result_range.length = 0; + + for (i = search_range.location; + i < search_range.location + search_range.length; + i++) { + + UniChar c; + + c = CFStringGetCharacterFromInlineBuffer(&buf, i); + if (CFCharacterSetIsCharacterMember((CFCharacterSetRef)charset, + c)) { + if (result_range.length == 0) { + result_range.location = i; + result_range.length = 1; + previous_char = c; + } + else { + if (result_range.location + result_range.length == i + && (!squeeze_mode || previous_char == c)) { + result_range.length++; + } + else { + (*cb)(&search_range, (const CFRange *)&result_range, + str, previous_char, ctx); + result_range.location = i; + result_range.length = 1; + previous_char = c; + if (search_range.location + search_range.length < n) { + result_range.location -= n + - (search_range.location + search_range.length); + mutated = true; + break; + } + } + } + } + } + if (!mutated) { + if (result_range.length != 0) { + (*cb)(&search_range, (const CFRange *)&result_range, str, + previous_char, ctx); + result_range.length = 0; + previous_char = 0; + } + } + } + while (search_range.length != 0 && result_range.length != 0); +#endif + + CFRelease(charset); +} + +struct tr_trans_cb_ctx { + VALUE orepl; + const char *src; + long src_len; + const char *repl; + long repl_len; + int sflag; + bool changed; + CFStringRef opt; +}; + +static inline void +trans_replace(CFMutableStringRef str, const CFRange *result_range, + CFStringRef substr, CFRange *search_range, int sflag) +{ + if (sflag == 0) { + long n; + for (n = result_range->location; + n < result_range->location + result_range->length; + n++) + CFStringReplace(str, CFRangeMake(n, 1), substr); + } + else { + CFStringReplace(str, *result_range, substr); + search_range->length -= result_range->length + + (result_range->location - search_range->location) - 1; + search_range->location = result_range->location + 1; + } +} + +static void +rb_str_trans_cb(CFRange *search_range, const CFRange *result_range, + CFStringRef str, UniChar character, void *ctx) +{ + struct tr_trans_cb_ctx *_ctx; + + _ctx = (struct tr_trans_cb_ctx *)ctx; + if (_ctx->repl_len == 0) { + CFStringDelete((CFMutableStringRef)str, *result_range); + search_range->length -= result_range->length + + (result_range->location - search_range->location); + search_range->location = result_range->location; + } + else if (_ctx->repl_len == 1) { + trans_replace((CFMutableStringRef)str, result_range, + (CFStringRef)_ctx->orepl, search_range, _ctx->sflag); + } + else if (_ctx->repl_len > 1) { + if (_ctx->src_len == 1) { + if (_ctx->opt == NULL) { + _ctx->opt = CFStringCreateWithBytes(NULL, + (const UInt8 *)_ctx->repl, 1, kCFStringEncodingUTF8, + false); + } + trans_replace((CFMutableStringRef)str, result_range, + (CFStringRef)_ctx->opt, search_range, _ctx->sflag); + } + else { + /* TODO: support all syntaxes */ + char sb, se, rb, re; + long n; + bool s_is_range, r_is_range; + CFStringRef substr; + bool release_substr; + long delta; + + if (_ctx->src_len == 3 && _ctx->src[1] == '-') { + sb = _ctx->src[0]; + se = _ctx->src[2]; + s_is_range = true; + } + else { + s_is_range = false; + if (_ctx->src[0] == '^' || strchr(_ctx->src, '-') != NULL) + rb_raise(rb_eRuntimeError, "src argument value (%s) not " \ + "supported yet", _ctx->src); + } + + if (_ctx->repl_len == 3 && _ctx->repl[1] == '-') { + rb = _ctx->repl[0]; + re = _ctx->repl[2]; + r_is_range = true; + } + else { + r_is_range = false; + if (_ctx->repl[0] == '^' || strchr(_ctx->repl, '-') != NULL) + rb_raise(rb_eRuntimeError, "repl argument value (%s) not " \ + "supported yet", _ctx->repl); + } + + if (s_is_range) { + assert(sb <= character && se >= character); + delta = character - sb; + } + else { + char *p; + p = strchr(_ctx->src, character); + assert(p != NULL); + delta = (long)p - (long)_ctx->src; + } + + if ((r_is_range && delta > (re - rb)) + || (!r_is_range && delta > _ctx->repl_len)) { + if (_ctx->opt == NULL) { + _ctx->opt = CFStringCreateWithBytes(NULL, + (const UInt8 *)&_ctx->repl[_ctx->repl_len - 1], + 1, + kCFStringEncodingUTF8, + false); + } + substr = _ctx->opt; + release_substr = false; + } + else { + const char r = r_is_range + ? rb + delta : _ctx->repl[delta]; + substr = CFStringCreateWithBytes(NULL, (const UInt8 *)&r, 1, + kCFStringEncodingUTF8, false); + release_substr = true; + } + + trans_replace((CFMutableStringRef)str, result_range, + (CFStringRef)substr, search_range, _ctx->sflag); + + if (release_substr) + CFRelease(substr); + } + } + _ctx->changed = true; +} +#endif + static VALUE tr_trans(VALUE str, VALUE src, VALUE repl, int sflag) { +#if WITH_OBJC + struct tr_trans_cb_ctx _ctx; + + StringValue(src); + StringValue(repl); + + if (RSTRING_CLEN(str) == 0) + return Qnil; + + _ctx.orepl = repl; + _ctx.src = RSTRING_CPTR(src); + _ctx.repl = RSTRING_CPTR(repl); + + /* TODO: support non-8-bit src/repl */ + assert(_ctx.src != NULL && _ctx.repl != NULL); + + _ctx.src_len = strlen(_ctx.src); + _ctx.repl_len = strlen(_ctx.repl); + _ctx.sflag = sflag; + _ctx.changed = false; + _ctx.opt = NULL; + + str_charset_find((CFStringRef)str, &src, 1, _ctx.repl_len > 1, + rb_str_trans_cb, &_ctx); + + if (_ctx.opt != NULL) + CFRelease(_ctx.opt); + + return _ctx.changed ? str : Qnil; +#else SIGNED_VALUE trans[256]; rb_encoding *enc, *e1, *e2; struct tr trsrc, trrepl; @@ -5083,8 +5417,8 @@ return str; } return Qnil; +#endif } -#endif /* * call-seq: @@ -5098,12 +5432,7 @@ static VALUE rb_str_tr_bang(VALUE str, VALUE src, VALUE repl) { -#if WITH_OBJC - /* TODO */ - rb_notimplement(); -#else return tr_trans(str, src, repl, 0); -#endif } @@ -5128,11 +5457,7 @@ rb_str_tr(VALUE str, VALUE src, VALUE repl) { str = rb_str_dup(str); -#if WITH_OBJC - rb_notimplement(); -#else - tr_trans(str, src, repl, 0); -#endif + rb_str_tr_bang(str, src, repl); return str; } @@ -5212,177 +5537,8 @@ #else -typedef void str_charset_find_cb -(CFRange *, const CFRange *, CFStringRef, void *); - -static void -str_charset_find(CFStringRef str, VALUE *charsets, int charset_count, - bool squeeze_mode, str_charset_find_cb *cb, void *ctx) -{ - int i; - long n; - bool changed; - CFMutableCharacterSetRef charset; - CFRange search_range, result_range; - - if (charset_count == 0) - return; - n = CFStringGetLength((CFStringRef)str); - if (n == 0) - return; - - for (i = 0, charset = NULL; i < charset_count; i++) { - VALUE s = charsets[i]; - bool exclude; - const char *sptr, *p; - - StringValue(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 { - if (charset == NULL) { - charset = CFCharacterSetCreateMutable(NULL); - CFCharacterSetAddCharactersInString(charset, (CFStringRef)s); - } - else { - CFCharacterSetRef subset; - subset = CFCharacterSetCreateWithCharactersInString(NULL, - (CFStringRef)s); - CFCharacterSetIntersect(charset, subset); - CFRelease(subset); - } - } - } - - search_range = CFRangeMake(0, n); -#if 0 - while (search_range.length != 0 - && CFStringFindCharacterFromSet( - (CFStringRef)str, - (CFCharacterSetRef)charset, - search_range, - 0, - &result_range)) { - (*cb)(&search_range, (const CFRange *)&result_range, str, ctx); - } -#else - CFStringInlineBuffer buf; - UniChar previous_char = 0; - CFStringInitInlineBuffer((CFStringRef)str, &buf, search_range); - do { - long i; - bool mutated = false; - - if (search_range.location + search_range.length < n) { - n = search_range.location + search_range.length; - CFStringInitInlineBuffer((CFStringRef)str, &buf, CFRangeMake(0, n)); - } - - result_range.length = 0; - - for (i = search_range.location; - i < search_range.location + search_range.length; - i++) { - - UniChar c; - - c = CFStringGetCharacterFromInlineBuffer(&buf, i); - if (CFCharacterSetIsCharacterMember((CFCharacterSetRef)charset, - c)) { - if (result_range.length == 0) { - result_range.location = i; - result_range.length = 1; - previous_char = c; - } - else { - if (result_range.location + result_range.length == i - && (!squeeze_mode || previous_char == c)) { - result_range.length++; - } - else { - (*cb)(&search_range, (const CFRange *)&result_range, - str, ctx); - result_range.location = i; - result_range.length = 1; - previous_char = c; - if (search_range.location + search_range.length < n) { - result_range.location -= n - - (search_range.location + search_range.length); - mutated = true; - break; - } - } - } - } - } - if (!mutated) { - if (result_range.length != 0) { - (*cb)(&search_range, (const CFRange *)&result_range, str, - ctx); - result_range.length = 0; - previous_char = 0; - } - } - } - while (search_range.length != 0 && result_range.length != 0); #endif - CFRelease(charset); -} - -#endif - /* * call-seq: * str.delete!([other_str]+) => str or nil @@ -5394,7 +5550,7 @@ #if WITH_OBJC static void rb_str_delete_bang_cb(CFRange *search_range, const CFRange *result_range, - CFStringRef str, void *ctx) + CFStringRef str, UniChar character, void *ctx) { CFStringDelete((CFMutableStringRef)str, *result_range); search_range->length -= result_range->length @@ -5498,7 +5654,7 @@ #if WITH_OBJC static void rb_str_squeeze_bang_cb(CFRange *search_range, const CFRange *result_range, - CFStringRef str, void *ctx) + CFStringRef str, UniChar character, void *ctx) { if (result_range->length > 1) { CFRange to_delete = *result_range; @@ -5614,11 +5770,7 @@ static VALUE rb_str_tr_s_bang(VALUE str, VALUE src, VALUE repl) { -#if WITH_OBJC - rb_notimplement(); -#else return tr_trans(str, src, repl, 1); -#endif } @@ -5663,7 +5815,7 @@ #if WITH_OBJC static void rb_str_count_cb(CFRange *search_range, const CFRange *result_range, - CFStringRef str, void *ctx) + CFStringRef str, UniChar character, void *ctx) { (*(int *)ctx) += result_range->length; }

1 0

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

19 Apr '08

Revision: 158 http://trac.macosforge.org/projects/ruby/changeset/158 Author: lsansonetti(a)apple.com Date: 2008-04-19 02:01:14 -0700 (Sat, 19 Apr 2008) Log Message: ----------- implementing #squeeze Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2008-04-19 06:22:34 UTC (rev 157) +++ MacRuby/trunk/string.c 2008-04-19 09:01:14 UTC (rev 158) @@ -5217,7 +5217,7 @@ static void str_charset_find(CFStringRef str, VALUE *charsets, int charset_count, - str_charset_find_cb *cb, void *ctx) + bool squeeze_mode, str_charset_find_cb *cb, void *ctx) { int i; long n; @@ -5318,9 +5318,11 @@ } #else CFStringInlineBuffer buf; + UniChar previous_char = 0; CFStringInitInlineBuffer((CFStringRef)str, &buf, search_range); do { long i; + bool mutated = false; if (search_range.location + search_range.length < n) { n = search_range.location + search_range.length; @@ -5341,28 +5343,36 @@ if (result_range.length == 0) { result_range.location = i; result_range.length = 1; + previous_char = c; } else { - if (result_range.location + result_range.length == i) { + if (result_range.location + result_range.length == i + && (!squeeze_mode || previous_char == c)) { result_range.length++; } else { - (*cb)(&search_range, (const CFRange *)&result_range, str, - ctx); + (*cb)(&search_range, (const CFRange *)&result_range, + str, ctx); result_range.location = i; result_range.length = 1; + previous_char = c; if (search_range.location + search_range.length < n) { result_range.location -= n - (search_range.location + search_range.length); + mutated = true; + break; } - break; } } - } + } } - if (result_range.length != 0) { - (*cb)(&search_range, (const CFRange *)&result_range, str, - ctx); + if (!mutated) { + if (result_range.length != 0) { + (*cb)(&search_range, (const CFRange *)&result_range, str, + ctx); + result_range.length = 0; + previous_char = 0; + } } } while (search_range.length != 0 && result_range.length != 0); @@ -5403,8 +5413,8 @@ rb_raise(rb_eArgError, "wrong number of arguments"); rb_str_modify(str); changed = false; - str_charset_find((CFStringRef)str, argv, argc, rb_str_delete_bang_cb, - &changed); + str_charset_find((CFStringRef)str, argv, argc, false, + rb_str_delete_bang_cb, &changed); if (!changed) return Qnil; return str; @@ -5485,11 +5495,41 @@ * <code>nil</code> if no changes were made. */ +#if WITH_OBJC +static void +rb_str_squeeze_bang_cb(CFRange *search_range, const CFRange *result_range, + CFStringRef str, void *ctx) +{ + if (result_range->length > 1) { + CFRange to_delete = *result_range; + to_delete.length--; + CFStringDelete((CFMutableStringRef)str, to_delete); + search_range->length -= result_range->length + + (result_range->location - search_range->location); + search_range->location = result_range->location + 1; + *(bool *)ctx = true; + } +} +#endif + static VALUE rb_str_squeeze_bang(int argc, VALUE *argv, VALUE str) { #if WITH_OBJC - rb_notimplement(); + bool changed; + VALUE all_chars; + if (argc == 0) { + argc = 1; + all_chars = (VALUE)CFSTR("a-z"); + argv = &all_chars; + } + rb_str_modify(str); + changed = false; + str_charset_find((CFStringRef)str, argv, argc, true, + rb_str_squeeze_bang_cb, &changed); + if (!changed) + return Qnil; + return str; #else char squeez[256]; rb_encoding *enc = 0; @@ -5625,9 +5665,6 @@ 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 @@ -5640,7 +5677,8 @@ 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); + str_charset_find((CFStringRef)str, argv, argc, false, + rb_str_count_cb, &count); return INT2NUM(count); #else char table[256];

1 0

[157] MacRuby/trunk
by source_changes＠macosforge.org 19 Apr '08

19 Apr '08

Revision: 157 http://trac.macosforge.org/projects/ruby/changeset/157 Author: lsansonetti(a)apple.com Date: 2008-04-18 23:22:34 -0700 (Fri, 18 Apr 2008) Log Message: ----------- new string format implementation Modified Paths: -------------- MacRuby/trunk/objc.m MacRuby/trunk/sprintf.c Modified: MacRuby/trunk/objc.m =================================================================== --- MacRuby/trunk/objc.m 2008-04-19 06:21:34 UTC (rev 156) +++ MacRuby/trunk/objc.m 2008-04-19 06:22:34 UTC (rev 157) @@ -2532,6 +2532,139 @@ assert(object_setInstanceVariable((id)obj, IVAR_CLUSTER_NAME, v) != NULL); } +static void +rb_objc_get_types_for_format_str(char **octypes, const int len, + const char *format_str) +{ + unsigned i, j, format_str_len; + + format_str_len = strlen(format_str); + i = j = 0; + + while (i < format_str_len) { + if (format_str[i++] != '%') + continue; + if (i < format_str_len && format_str[i] == '%') { + i++; + continue; + } + while (i < format_str_len) { + char *type = NULL; + switch (format_str[i++]) { + case 'd': + case 'i': + case 'o': + case 'u': + case 'x': + case 'X': + case 'c': + case 'C': + type = "i"; // _C_INT; + break; + + case 'D': + case 'O': + case 'U': + type = "l"; // _C_LNG; + break; + + case 'f': + case 'F': + case 'e': + case 'E': + case 'g': + case 'G': + case 'a': + case 'A': + type = "d"; // _C_DBL; + break; + + case 's': + case 'S': + type = "*"; // _C_CHARPTR; + break; + + case 'p': + type = "^"; // _C_PTR; + break; + + case '@': + type = "@"; // _C_ID; + break; + } + + if (type != NULL) { + if (len == 0 || j >= len) + rb_raise(rb_eArgError, + "Too much tokens in the format string `%s' "\ + "for the given %d argument(s)", format_str, len); + octypes[j++] = type; + break; + } + } + } + for (; j < len; j++) + octypes[j] = "@"; // _C_ID; +} + +VALUE +rb_str_format(int argc, const VALUE *argv, VALUE fmt) +{ + char **types; + ffi_type *ffi_rettype, **ffi_argtypes; + void *ffi_ret, **ffi_args; + ffi_cif *cif; + int i; + void *null; + + if (argc == 0) + return fmt; + + types = (char **)alloca(sizeof(char *) * argc); + ffi_argtypes = (ffi_type **)alloca(sizeof(ffi_type *) * argc + 4); + ffi_args = (void **)alloca(sizeof(void *) * argc + 4); + + null = NULL; + + ffi_argtypes[0] = &ffi_type_pointer; + ffi_args[0] = &null; + ffi_argtypes[1] = &ffi_type_pointer; + ffi_args[1] = &null; + ffi_argtypes[2] = &ffi_type_pointer; + ffi_args[2] = &fmt; + + if (argc > 0) { + rb_objc_get_types_for_format_str(types, argc, RSTRING_CPTR(fmt)); + + for (i = 0; i < argc; i++) { + ffi_argtypes[i + 3] = rb_objc_octype_to_ffitype(types[i]); + ffi_args[i + 3] = (void *)alloca(ffi_argtypes[i + 3]->size); + rb_objc_rval_to_ocval(argv[i], types[i], ffi_args[i + 3]); + } + } + + ffi_argtypes[argc + 4] = NULL; + ffi_args[argc + 4] = NULL; + + ffi_rettype = &ffi_type_pointer; + + cif = (ffi_cif *)alloca(sizeof(ffi_cif)); + + if (ffi_prep_cif(cif, FFI_DEFAULT_ABI, argc + 3, ffi_rettype, ffi_argtypes) + != FFI_OK) + rb_fatal("can't prepare cif for CFStringCreateWithFormat"); + + ffi_ret = NULL; + + ffi_call(cif, FFI_FN(CFStringCreateWithFormat), &ffi_ret, ffi_args); + + if (ffi_ret != NULL) { + CFMakeCollectable((CFTypeRef)ffi_ret); + return (VALUE)ffi_ret; + } + return Qnil; +} + void Init_ObjC(void) { Modified: MacRuby/trunk/sprintf.c =================================================================== --- MacRuby/trunk/sprintf.c 2008-04-19 06:21:34 UTC (rev 156) +++ MacRuby/trunk/sprintf.c 2008-04-19 06:22:34 UTC (rev 157) @@ -243,6 +243,7 @@ return rb_str_format(argc - 1, argv + 1, GETNTHARG(0)); } +#if !WITH_OBJC VALUE rb_str_format(int argc, const VALUE *argv, VALUE fmt) { @@ -854,6 +855,7 @@ if (tainted) OBJ_TAINT(result); return result; } +#endif static void fmt_setup(char *buf, int c, int flags, int width, int prec)

1 0

[156] MacRuby/trunk/hash.c
by source_changes＠macosforge.org 19 Apr '08

19 Apr '08

Revision: 156 http://trac.macosforge.org/projects/ruby/changeset/156 Author: lsansonetti(a)apple.com Date: 2008-04-18 23:21:34 -0700 (Fri, 18 Apr 2008) Log Message: ----------- fixed Hash#inspect Modified Paths: -------------- MacRuby/trunk/hash.c Modified: MacRuby/trunk/hash.c =================================================================== --- MacRuby/trunk/hash.c 2008-04-19 05:01:46 UTC (rev 155) +++ MacRuby/trunk/hash.c 2008-04-19 06:21:34 UTC (rev 156) @@ -1549,16 +1549,20 @@ VALUE str2; if (key == Qundef) return ST_CONTINUE; - if (RSTRING_LEN(str) > 1) { + if (RSTRING_CLEN(str) > 1) { rb_str_cat2(str, ", "); } str2 = rb_inspect(key); rb_str_buf_append(str, str2); +#if !WITH_OBJC OBJ_INFECT(str, str2); +#endif rb_str_buf_cat2(str, "=>"); str2 = rb_inspect(value); rb_str_buf_append(str, str2); +#if !WITH_OBJC OBJ_INFECT(str, str2); +#endif return ST_CONTINUE; }

1 0

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

19 Apr '08

Revision: 155 http://trac.macosforge.org/projects/ruby/changeset/155 Author: lsansonetti(a)apple.com Date: 2008-04-18 22:01:46 -0700 (Fri, 18 Apr 2008) Log Message: ----------- faster #count, #delete Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2008-04-18 20:29:09 UTC (rev 154) +++ MacRuby/trunk/string.c 2008-04-19 05:01:46 UTC (rev 155) @@ -5306,6 +5306,7 @@ } search_range = CFRangeMake(0, n); +#if 0 while (search_range.length != 0 && CFStringFindCharacterFromSet( (CFStringRef)str, @@ -5315,7 +5316,58 @@ &result_range)) { (*cb)(&search_range, (const CFRange *)&result_range, str, ctx); } +#else + CFStringInlineBuffer buf; + CFStringInitInlineBuffer((CFStringRef)str, &buf, search_range); + do { + long i; + if (search_range.location + search_range.length < n) { + n = search_range.location + search_range.length; + CFStringInitInlineBuffer((CFStringRef)str, &buf, CFRangeMake(0, n)); + } + + result_range.length = 0; + + for (i = search_range.location; + i < search_range.location + search_range.length; + i++) { + + UniChar c; + + c = CFStringGetCharacterFromInlineBuffer(&buf, i); + if (CFCharacterSetIsCharacterMember((CFCharacterSetRef)charset, + c)) { + if (result_range.length == 0) { + result_range.location = i; + result_range.length = 1; + } + else { + if (result_range.location + result_range.length == i) { + result_range.length++; + } + else { + (*cb)(&search_range, (const CFRange *)&result_range, str, + ctx); + result_range.location = i; + result_range.length = 1; + if (search_range.location + search_range.length < n) { + result_range.location -= n + - (search_range.location + search_range.length); + } + break; + } + } + } + } + if (result_range.length != 0) { + (*cb)(&search_range, (const CFRange *)&result_range, str, + ctx); + } + } + while (search_range.length != 0 && result_range.length != 0); +#endif + CFRelease(charset); }

1 0

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

18 Apr '08

Revision: 154 http://trac.macosforge.org/projects/ruby/changeset/154 Author: lsansonetti(a)apple.com Date: 2008-04-18 13:29:09 -0700 (Fri, 18 Apr 2008) Log Message: ----------- better #inspect/#dump, using bytestring only when necessary Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2008-04-18 07:52:56 UTC (rev 153) +++ MacRuby/trunk/string.c 2008-04-18 20:29:09 UTC (rev 154) @@ -140,6 +140,14 @@ } } +static inline bool +rb_objc_str_is_bytestring(VALUE str) +{ + struct rb_objc_str_struct *s; + s = rb_objc_str_get_struct(str); + return s != NULL && s->cfdata != NULL; +} + static void * rb_str_cfdata(VALUE str) { @@ -197,6 +205,49 @@ CFStringReplaceAll((CFMutableStringRef)str, (CFStringRef)bytestr); } +VALUE +rb_str_freeze(VALUE str) +{ + 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; +} + +static VALUE +rb_str_bytestring_m(VALUE str) +{ + return rb_objc_str_is_bytestring(str) ? Qtrue : Qfalse; +} #endif #define is_ascii_string(str) (rb_enc_str_coderange(str) == ENC_CODERANGE_7BIT) @@ -444,12 +495,13 @@ static inline void str_frozen_check(VALUE s) { -#if !WITH_OBJC - /* TODO */ +#if WITH_OBJC + if (rb_str_frozen(s) == Qtrue) { +#else if (OBJ_FROZEN(s)) { +#endif rb_raise(rb_eRuntimeError, "string frozen"); } -#endif } static VALUE @@ -576,7 +628,9 @@ { VALUE str = rb_str_new(ptr, len); -#if !WITH_OBJC /* TODO */ +#if WITH_OBJC + rb_str_taint(str); +#else OBJ_TAINT(str); #endif return str; @@ -587,7 +641,9 @@ { VALUE str = rb_str_new2(ptr); -#if !WITH_OBJC /* TODO */ +#if WITH_OBJC + rb_str_taint(str); +#else OBJ_TAINT(str); #endif return str; @@ -730,7 +786,7 @@ { VALUE str = str_alloc(rb_cString); -#if !WITH_OBJC // TODO should we pass capa as the CFString's maxLength? +#if !WITH_OBJC if (capa < STR_BUF_MIN_SIZE) { capa = STR_BUF_MIN_SIZE; } @@ -1172,8 +1228,11 @@ #if WITH_OBJC bool _CFStringIsMutable(void *); if (!__CFStringIsMutable(str)) - rb_raise(rb_eRuntimeError, "can't modify immutable array"); - /* TODO test for freeze/taint state */ + rb_raise(rb_eRuntimeError, "can't modify immutable string"); + if (rb_str_frozen(str) == Qtrue) + rb_error_frozen("string"); + if (rb_str_tainted(str) == Qfalse && rb_safe_level() >= 4) + rb_raise(rb_eSecurityError, "Insecure: can't modify string"); #else if (FL_TEST(str, STR_TMPLOCK)) { rb_raise(rb_eRuntimeError, "can't modify string; temporarily locked"); @@ -1566,56 +1625,16 @@ #endif } -#if WITH_OBJC +#if !WITH_OBJC VALUE rb_str_freeze(VALUE str) { - 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 VALUE @@ -2222,9 +2241,13 @@ int rb_memhash(const void *ptr, long len) { - /* TODO is that really needed? */ - CFDataRef data = CFDataCreate(NULL, (const UInt8 *)ptr, len); - return CFHash(data); + CFDataRef data; + int code; + + data = CFDataCreate(NULL, (const UInt8 *)ptr, len); + code = CFHash(data); + CFRelease((CFTypeRef)data); + return code; } int @@ -4260,22 +4283,25 @@ VALUE rb_str_inspect(VALUE str) { -#if WITH_OBJC - VALUE result = rb_str_new(NULL, 0); - rb_str_cat2(result, "\""); - rb_str_buf_append(result, str); - rb_str_cat2(result, "\""); - /* TODO needs to escape some characters */ - return result; -#else rb_encoding *enc = STR_ENC_GET(str); - char *p, *pend; + const char *p, *pend; VALUE result = rb_str_buf_new2(""); if (!rb_enc_asciicompat(enc)) enc = rb_usascii_encoding(); rb_enc_associate(result, enc); str_cat_char(result, '"', enc); +#if WITH_OBJC + if (rb_objc_str_is_bytestring(str)) { + p = (const char *)RSTRING_PTR(str); + pend = (const char *)RSTRING_END(str); + } + else { + p = RSTRING_CPTR(str); + pend = p + RSTRING_CLEN(str); + } +#else p = RSTRING_PTR(str); pend = RSTRING_END(str); +#endif while (p < pend) { int c; int n; @@ -4331,7 +4357,7 @@ else { char buf[5]; char *s; - char *q; + const char *q; escape_codepoint: for (q = p-n; q < p; q++) { @@ -4347,7 +4373,6 @@ OBJ_INFECT(result, str); return result; -#endif } #define IS_EVSTR(p,e) ((p) < (e) && (*(p) == '$' || *(p) == '@' || *(p) == '{')) @@ -4370,7 +4395,18 @@ VALUE result; len = 2; /* "" */ +#if WITH_OBJC + if (rb_objc_str_is_bytestring(str)) { + p = RSTRING_PTR(str); + pend = RSTRING_END(str); + } + else { + p = RSTRING_CPTR(str); + pend = p + RSTRING_CLEN(str); + } +#else p = RSTRING_PTR(str); pend = p + RSTRING_LEN(str); +#endif while (p < pend) { unsigned char c = *p++; switch (c) { @@ -7696,6 +7732,7 @@ 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); + rb_define_method(rb_cString, "__bytestring__?", rb_str_bytestring_m, 0); #else rb_cString = rb_define_class("String", rb_cObject); #endif

1 0

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

18 Apr '08

Revision: 153 http://trac.macosforge.org/projects/ruby/changeset/153 Author: lsansonetti(a)apple.com Date: 2008-04-18 00:52:56 -0700 (Fri, 18 Apr 2008) Log Message: ----------- transfert taint state during #sub/#gsub Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2008-04-18 03:48:17 UTC (rev 152) +++ MacRuby/trunk/string.c 2008-04-18 07:52:56 UTC (rev 153) @@ -3707,7 +3707,7 @@ if (NIL_P(hash)) { StringValue(repl); } - if (OBJ_TAINTED(repl)) tainted = 1; + if (rb_obj_tainted(repl) == Qtrue) tainted = 1; break; default: rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)", argc); @@ -3761,7 +3761,7 @@ val = rb_reg_regsub(repl, str, regs, pat); } - if (OBJ_TAINTED(val)) tainted = 1; + if (rb_obj_tainted(val) == Qtrue) tainted = 1; len = beg - offset; /* copy pre-match substr */ if (len) { @@ -3794,6 +3794,8 @@ CFStringReplaceAll((CFMutableStringRef)str, (CFStringRef)dest); } else { + if (!tainted && rb_str_tainted(str) == Qtrue) + tainted = 1; str = dest; } #else @@ -3808,7 +3810,7 @@ } #endif - if (tainted) OBJ_TAINT(str); + if (tainted) rb_str_taint(str); return str; }

1 0

[152] MacRuby/trunk/test/ruby/test_array.rb
by source_changes＠macosforge.org 18 Apr '08

18 Apr '08

Revision: 152 http://trac.macosforge.org/projects/ruby/changeset/152 Author: lsansonetti(a)apple.com Date: 2008-04-17 20:48:17 -0700 (Thu, 17 Apr 2008) Log Message: ----------- updated tests to reflect the new String changes Modified Paths: -------------- MacRuby/trunk/test/ruby/test_array.rb Modified: MacRuby/trunk/test/ruby/test_array.rb =================================================================== --- MacRuby/trunk/test/ruby/test_array.rb 2008-04-18 03:47:56 UTC (rev 151) +++ MacRuby/trunk/test/ruby/test_array.rb 2008-04-18 03:48:17 UTC (rev 152) @@ -461,7 +461,7 @@ def test_collect a = @cls[ 1, 'cat', 1..1 ] - assert_equal([ Fixnum, String, Range], a.collect {|e| e.class} ) + assert_equal([ Fixnum, NSCFString, Range], a.collect {|e| e.class} ) assert_equal([ 99, 99, 99], a.collect { 99 } ) assert_equal([], @cls[].collect { 99 }) @@ -475,8 +475,8 @@ # also update map! def test_collect! a = @cls[ 1, 'cat', 1..1 ] - assert_equal([ Fixnum, String, Range], a.collect! {|e| e.class} ) - assert_equal([ Fixnum, String, Range], a) + assert_equal([ Fixnum, NSCFString, Range], a.collect! {|e| e.class} ) + assert_equal([ Fixnum, NSCFString, Range], a) a = @cls[ 1, 'cat', 1..1 ] assert_equal([ 99, 99, 99], a.collect! { 99 } ) @@ -787,8 +787,8 @@ # also update collect! def test_map! a = @cls[ 1, 'cat', 1..1 ] - assert_equal(@cls[ Fixnum, String, Range], a.map! {|e| e.class} ) - assert_equal(@cls[ Fixnum, String, Range], a) + assert_equal(@cls[ Fixnum, NSCFString, Range], a.map! {|e| e.class} ) + assert_equal(@cls[ Fixnum, NSCFString, Range], a) a = @cls[ 1, 'cat', 1..1 ] assert_equal(@cls[ 99, 99, 99], a.map! { 99 } )

1 0