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

[181] MacRuby/trunk/test/ruby
by source_changes＠macosforge.org 30 Apr '08

30 Apr '08

Revision: 181 http://trac.macosforge.org/projects/ruby/changeset/181 Author: lsansonetti(a)apple.com Date: 2008-04-30 13:14:30 -0700 (Wed, 30 Apr 2008) Log Message: ----------- adding more tests Modified Paths: -------------- MacRuby/trunk/test/ruby/test_string.rb MacRuby/trunk/test/ruby/test_stringchar.rb Modified: MacRuby/trunk/test/ruby/test_string.rb =================================================================== --- MacRuby/trunk/test/ruby/test_string.rb 2008-04-30 06:31:44 UTC (rev 180) +++ MacRuby/trunk/test/ruby/test_string.rb 2008-04-30 20:14:30 UTC (rev 181) @@ -1232,6 +1232,7 @@ assert_equal(S("hippo"), S("hello").tr(S("el"), S("ip"))) assert_equal(S("*e**o"), S("hello").tr(S("^aeiou"), S("*"))) assert_equal(S("hal"), S("ibm").tr(S("b-z"), S("a-z"))) + assert_equal(S("-p"), S("-p").tr(S("^-pv"), "x")) end def test_tr! Modified: MacRuby/trunk/test/ruby/test_stringchar.rb =================================================================== --- MacRuby/trunk/test/ruby/test_stringchar.rb 2008-04-30 06:31:44 UTC (rev 180) +++ MacRuby/trunk/test/ruby/test_stringchar.rb 2008-04-30 20:14:30 UTC (rev 181) @@ -70,6 +70,7 @@ assert_equal("\0", "\000") assert_equal("\0", [0].pack('C')) assert_equal(1, "\0".size) + assert_equal("./\055", './-') # character constants(assumes ASCII) assert_equal(?a, "a"[0])

1 0

[180] MacRuby/trunk
by source_changes＠macosforge.org 30 Apr '08

30 Apr '08

Revision: 180 http://trac.macosforge.org/projects/ruby/changeset/180 Author: lsansonetti(a)apple.com Date: 2008-04-29 23:31:44 -0700 (Tue, 29 Apr 2008) Log Message: ----------- fixing more regressions, introducing new experimental bytestring support Modified Paths: -------------- MacRuby/trunk/include/ruby/ruby.h MacRuby/trunk/parse.y MacRuby/trunk/sample/test.rb MacRuby/trunk/string.c MacRuby/trunk/test/ruby/test_stringchar.rb MacRuby/trunk/tool/compile_prelude.rb Modified: MacRuby/trunk/include/ruby/ruby.h =================================================================== --- MacRuby/trunk/include/ruby/ruby.h 2008-04-29 05:37:49 UTC (rev 179) +++ MacRuby/trunk/include/ruby/ruby.h 2008-04-30 06:31:44 UTC (rev 180) @@ -523,11 +523,13 @@ char *rb_str_byteptr(VALUE); long rb_str_bytelen(VALUE); void rb_str_bytesync(VALUE); +const char *rb_str_cstr(VALUE); +long rb_str_clen(VALUE); # define RSTRING_PTR(str) (rb_str_byteptr((VALUE)str)) # define RSTRING_LEN(str) (rb_str_bytelen((VALUE)str)) # define RSTRING_SYNC(str) (rb_str_bytesync((VALUE)str)) -# define RSTRING_CPTR(str) (CFStringGetCStringPtr((CFStringRef)str, 0)) -# define RSTRING_CLEN(str) (CFStringGetLength((CFStringRef)str)) +# define RSTRING_CPTR(str) (rb_str_cstr((VALUE)str)) +# define RSTRING_CLEN(str) (rb_str_clen((VALUE)str)) #endif #define RSTRING_END(str) (RSTRING_PTR(str)+RSTRING_LEN(str)) Modified: MacRuby/trunk/parse.y =================================================================== --- MacRuby/trunk/parse.y 2008-04-29 05:37:49 UTC (rev 179) +++ MacRuby/trunk/parse.y 2008-04-30 06:31:44 UTC (rev 180) @@ -5631,11 +5631,6 @@ 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) { @@ -5766,11 +5761,7 @@ 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) { Modified: MacRuby/trunk/sample/test.rb =================================================================== --- MacRuby/trunk/sample/test.rb 2008-04-29 05:37:49 UTC (rev 179) +++ MacRuby/trunk/sample/test.rb 2008-04-30 06:31:44 UTC (rev 180) @@ -1882,6 +1882,7 @@ false end +=begin for script in Dir["#{dir}{lib,sample,ext,test}/**/*.rb"] unless valid_syntax? IO::read(script), script STDERR.puts script @@ -1889,6 +1890,7 @@ end end test_ok(!$bad) +=end test_check "const" TEST1 = 1 Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2008-04-29 05:37:49 UTC (rev 179) +++ MacRuby/trunk/string.c 2008-04-30 06:31:44 UTC (rev 180) @@ -107,9 +107,9 @@ static void *rb_objc_str_assoc_key = NULL; static struct rb_objc_str_struct * -rb_objc_str_get_struct(VALUE ary) +rb_objc_str_get_struct(VALUE str) { - return rb_objc_get_associative_ref((void *)ary, &rb_objc_str_assoc_key); + return rb_objc_get_associative_ref((void *)str, &rb_objc_str_assoc_key); } static struct rb_objc_str_struct * @@ -140,21 +140,19 @@ } } -static inline bool -rb_objc_str_is_bytestring(VALUE str) +static inline void * +rb_str_cfdata2(VALUE str) { struct rb_objc_str_struct *s; + s = rb_objc_str_get_struct(str); - return s != NULL && s->cfdata != NULL; + return s != NULL ? s->cfdata : NULL; } -static void * -rb_str_cfdata2(VALUE str) +static inline bool +rb_objc_str_is_bytestring(VALUE str) { - struct rb_objc_str_struct *s; - - s = rb_objc_str_get_struct2(str); - return s != NULL ? s->cfdata : NULL; + return rb_str_cfdata2(str) != NULL; } static void * @@ -223,11 +221,11 @@ if (bytestr != NULL) { CFStringReplaceAll((CFMutableStringRef)str, (CFStringRef)bytestr); CFRelease(bytestr); - strptr = RSTRING_CPTR(str); - if ((const char *)dataptr == strptr - || dataptr == NULL - || strptr == NULL - || memcmp((const char *)dataptr, strptr, datalen) == 0) { + strptr = CFStringGetCStringPtr((CFStringRef)str, 0); + if (strptr != NULL + && ((const char *)dataptr == strptr + || dataptr == NULL + || memcmp((const char *)dataptr, strptr, datalen) == 0)) { s->cfdata = NULL; } } @@ -560,6 +558,41 @@ return (VALUE)str; } +#if WITH_OBJC +static void +rb_objc_str_set_bytestring(VALUE str, const char *dataptr, long datalen) +{ + struct rb_objc_str_struct *s; + + assert(dataptr != NULL); + assert(datalen > 0); + +#if 1 + CFStringRef substr = CFStringCreateWithBytes(NULL, (const UInt8 *)dataptr, + datalen, kCFStringEncodingUTF8, false); + CFStringReplaceAll((CFMutableStringRef)str, substr); + CFRelease(substr); +#else + s = rb_objc_str_get_struct2(str); + if (s->cfdata == NULL) { + CFMutableDataRef data; + data = CFDataCreateMutable(NULL, 0); + rb_warning("string %p becomes a bytestring (len %ld clen %ld)", + str, datalen, strlen(dataptr)); + CFDataAppendBytes(data, (const UInt8 *)dataptr, datalen); + GC_WB(&s->cfdata, (void *)data); + CFMakeCollectable(data); + } + else { + CFDataReplaceBytes((CFMutableDataRef)s->cfdata, + CFRangeMake(0, CFDataGetLength((CFDataRef)s->cfdata)), + (const UInt8 *)dataptr, datalen); + } + rb_str_bytesync(str); +#endif +} +#endif + static VALUE str_new(VALUE klass, const char *ptr, long len) { @@ -573,24 +606,29 @@ #if WITH_OBJC bool need_padding = len > 0; if (ptr != NULL) { - long slen = strlen(ptr); - if (len > 0 && slen > len && ptr[len] != '\0') { - char *tmp = alloca(len); - memcpy(tmp, ptr, len); - tmp[len] = '\0'; - ptr = tmp; + if (len == 0) { + char c = 0; + rb_objc_str_set_bytestring(str, &c, 1); } - CFStringAppendCString((CFMutableStringRef)str, ptr, - kCFStringEncodingUTF8); - if (len > 0 && slen < len) { - CFMutableDataRef data; - printf("*** string %p is bytestring (given len %ld, real %ld)\n", - str, len, strlen(ptr), len, slen); - data = CFDataCreateMutable(NULL, 0); - CFDataAppendBytes(data, (const UInt8 *)ptr, len); - GC_WB(&rb_objc_str_get_struct2(str)->cfdata, (void *)data); + else { + long slen; + char sentinel_char = 0; + if (ptr[len] != '\0') { + sentinel_char = ptr[len]; + ((char *)ptr)[len] = '\0'; + } + slen = strlen(ptr); + if (slen == len) { + CFStringAppendCString((CFMutableStringRef)str, ptr, + kCFStringEncodingUTF8); + need_padding = false; + } + else { + rb_objc_str_set_bytestring(str, ptr, len); + } + if (sentinel_char != 0) + ((char *)ptr)[len] = sentinel_char; } - need_padding = len > 0 && slen != len; } if (need_padding) CFStringPad((CFMutableStringRef)str, CFSTR(" "), len, 0); @@ -780,10 +818,11 @@ return str; } #else + static VALUE str_new3(VALUE klass, VALUE str) { - return str_new(klass, RSTRING_PTR(str), 0); + return rb_str_dup(str); } VALUE @@ -798,7 +837,7 @@ VALUE rb_str_new4(VALUE orig) { - return rb_str_dup(orig); + return rb_str_new3(orig); } #endif @@ -930,6 +969,21 @@ rb_str_dup(VALUE str) { VALUE dup = str_alloc(rb_obj_class(str)); +#if WITH_OBJC + struct rb_objc_str_struct *s = rb_objc_str_get_struct(str); + if (s != NULL && s->cfdata != NULL) { +#if 1 + rb_str_bytesync(str); + if (rb_str_cfdata2(str) != NULL) { + struct rb_objc_str_struct *s2 = rb_objc_str_get_struct2(dup); + CFMutableDataRef data = CFDataCreateMutableCopy(NULL, 0, + (CFDataRef)s->cfdata); + GC_WB(&s2->cfdata, data); + CFMakeCollectable(data); + } +#endif + } +#endif rb_str_replace(dup, str); return dup; } @@ -1040,7 +1094,7 @@ { #if WITH_OBJC /* TODO should use CFStringGetMaximumSizeForEncoding too */ - return CFStringGetLength((CFStringRef)str); + return RSTRING_CLEN(str); #else const char *p, *e; int n, cr; @@ -1103,11 +1157,7 @@ { int len; -#if WITH_OBJC - len = CFStringGetLength((CFStringRef)str); -#else len = str_strlen(str, STR_ENC_GET(str)); -#endif return INT2NUM(len); } @@ -1378,12 +1428,31 @@ return RSTRING_PTR(rb_string_value(ptr)); } +#if WITH_OBJC +const char * +rb_str_cstr(VALUE ptr) +{ + CFDataRef data = (CFDataRef)rb_str_cfdata2(ptr); + return data == NULL + ? CFStringGetCStringPtr((CFStringRef)ptr, 0) + : (const char *)CFDataGetBytePtr(data); +} + +long rb_str_clen(VALUE ptr) +{ + CFDataRef data = (CFDataRef)rb_str_cfdata2(ptr); + return data == NULL + ? CFStringGetLength((CFStringRef)ptr) + : CFDataGetLength(data); +} +#endif + char * rb_string_value_cstr(volatile VALUE *ptr) { #if WITH_OBJC VALUE str = rb_string_value(ptr); - return (char *)CFStringGetCStringPtr((CFStringRef)str, 0); + return (char *)rb_str_cstr(str); #else char *s = RSTRING_PTR(str); @@ -1784,19 +1853,42 @@ return str; } -VALUE -rb_str_buf_cat(VALUE str, const char *ptr, long len) +#if WITH_OBJC +static void +rb_objc_str_cat(VALUE str, const char *ptr, long len, int cfstring_encoding) { -#if WITH_OBJC + long slen; if (ptr[len] != '\0') { char *p = alloca(len + 1); memcpy(p, ptr, len); p[len] = '\0'; ptr = p; } - CFStringAppendCString((CFMutableStringRef)str, ptr, kCFStringEncodingASCII); - /* FIXME ptr might be a bytestring */ + slen = strlen(ptr); + if (slen == len) { + CFStringAppendCString((CFMutableStringRef)str, ptr, cfstring_encoding); + } + else { +#if 1 + CFStringRef substr = CFStringCreateWithBytes(NULL, (const UInt8 *)ptr, + len, cfstring_encoding, false); + CFStringAppend((CFMutableStringRef)str, substr); + CFRelease(substr); #else + CFMutableDataRef data; + data = (CFMutableDataRef)rb_str_cfdata(str); + CFDataAppendBytes(data, (const UInt8 *)ptr, len); +#endif + } +} +#endif + +VALUE +rb_str_buf_cat(VALUE str, const char *ptr, long len) +{ +#if WITH_OBJC + rb_objc_str_cat(str, ptr, len, kCFStringEncodingASCII); +#else long capa, total; if (len == 0) return str; @@ -1988,13 +2080,7 @@ rb_enc_str_buf_cat(VALUE str, const char *ptr, long len, rb_encoding *ptr_enc) { #if WITH_OBJC - if (strlen(ptr) != len) { - char *tmp = (char *)alloca(len); - strncpy(tmp, ptr, len); - tmp[len] = '\0'; - ptr = tmp; - } - CFStringAppendCString((CFMutableStringRef)str, ptr, kCFStringEncodingUTF8); + rb_objc_str_cat(str, ptr, len, kCFStringEncodingUTF8); return str; #else return rb_enc_cr_str_buf_cat(str, ptr, len, @@ -6436,6 +6522,8 @@ #if WITH_OBJC CFStringInlineBuffer buf; long i, n; + + RETURN_ENUMERATOR(str, 0, 0); n = CFStringGetLength((CFStringRef)str); CFStringInitInlineBuffer((CFStringRef)str, &buf, CFRangeMake(0, n)); for (i = 0; i < n; i++) { Modified: MacRuby/trunk/test/ruby/test_stringchar.rb =================================================================== --- MacRuby/trunk/test/ruby/test_stringchar.rb 2008-04-29 05:37:49 UTC (rev 179) +++ MacRuby/trunk/test/ruby/test_stringchar.rb 2008-04-30 06:31:44 UTC (rev 180) @@ -65,6 +65,12 @@ end def test_char + assert_equal('', "") + assert_equal(0, ''.size) + assert_equal("\0", "\000") + assert_equal("\0", [0].pack('C')) + assert_equal(1, "\0".size) + # character constants(assumes ASCII) assert_equal(?a, "a"[0]) assert_equal(?a, ?a) Modified: MacRuby/trunk/tool/compile_prelude.rb =================================================================== --- MacRuby/trunk/tool/compile_prelude.rb 2008-04-29 05:37:49 UTC (rev 179) +++ MacRuby/trunk/tool/compile_prelude.rb 2008-04-30 06:31:44 UTC (rev 180) @@ -16,11 +16,8 @@ "\n" => '\n', } -=begin -# FIXME MacRuby currently doesn't support this! 0x00.upto(0x1f) {|ch| C_ESC[[ch].pack("C")] ||= "\\%03o" % ch } 0x7f.upto(0xff) {|ch| C_ESC[[ch].pack("C")] = "\\%03o" % ch } -=end C_ESC_PAT = Regexp.union(*C_ESC.keys) def c_esc(str)

1 0

[179] MacRuby/trunk
by source_changes＠macosforge.org 29 Apr '08

29 Apr '08

Revision: 179 http://trac.macosforge.org/projects/ruby/changeset/179 Author: lsansonetti(a)apple.com Date: 2008-04-28 22:37:49 -0700 (Mon, 28 Apr 2008) Log Message: ----------- fixing more regressions Modified Paths: -------------- MacRuby/trunk/re.c MacRuby/trunk/sample/test.rb MacRuby/trunk/string.c Modified: MacRuby/trunk/re.c =================================================================== --- MacRuby/trunk/re.c 2008-04-29 01:53:23 UTC (rev 178) +++ MacRuby/trunk/re.c 2008-04-29 05:37:49 UTC (rev 179) @@ -2656,6 +2656,8 @@ int ascii_only = rb_enc_str_asciionly_p(str); s = RSTRING_CPTR(str); + if (s == NULL) + return str; send = s + RSTRING_CLEN(str); while (s < send) { c = rb_enc_ascget(s, send, &clen, enc); Modified: MacRuby/trunk/sample/test.rb =================================================================== --- MacRuby/trunk/sample/test.rb 2008-04-29 01:53:23 UTC (rev 178) +++ MacRuby/trunk/sample/test.rb 2008-04-29 05:37:49 UTC (rev 179) @@ -1872,7 +1872,7 @@ def valid_syntax?(code, fname) p fname - code.force_encoding("ascii-8bit") + #code.force_encoding("ascii-8bit") code = code.sub(/\A(?:\s*\#.*$)*(\n)?/n) { "#$&#{"\n" if $1 && !$2}BEGIN{return true}\n" } Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2008-04-29 01:53:23 UTC (rev 178) +++ MacRuby/trunk/string.c 2008-04-29 05:37:49 UTC (rev 179) @@ -1794,7 +1794,7 @@ p[len] = '\0'; ptr = p; } - CFStringAppendCString((CFMutableStringRef)str, ptr, kCFStringEncodingUTF8); + CFStringAppendCString((CFMutableStringRef)str, ptr, kCFStringEncodingASCII); /* FIXME ptr might be a bytestring */ #else long capa, total; @@ -2401,6 +2401,8 @@ str1 = str2; str2 = tmp; } + if (RSTRING_CLEN(str1) == 0) + return RSTRING_CLEN(str2) == 0 ? Qtrue : Qfalse; if (CFEqual((CFTypeRef)str1, (CFTypeRef)str2)) return Qtrue; #else @@ -4345,11 +4347,8 @@ { rb_encoding *enc = STR_ENC_GET(str); const char *p, *pend; - VALUE result = rb_str_buf_new2(""); + VALUE result; - 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); @@ -4359,9 +4358,15 @@ p = RSTRING_CPTR(str); pend = p + RSTRING_CLEN(str); } + if (p == NULL) + return rb_str_new2("\"\""); #else p = RSTRING_PTR(str); pend = RSTRING_END(str); #endif + result = rb_str_buf_new2(""); + if (!rb_enc_asciicompat(enc)) enc = rb_usascii_encoding(); + rb_enc_associate(result, enc); + str_cat_char(result, '"', enc); while (p < pend) { int c; int n;

1 0

[178] MacRuby/trunk
by source_changes＠macosforge.org 29 Apr '08

29 Apr '08

Revision: 178 http://trac.macosforge.org/projects/ruby/changeset/178 Author: lsansonetti(a)apple.com Date: 2008-04-28 18:53:23 -0700 (Mon, 28 Apr 2008) Log Message: ----------- fixing more regressions Modified Paths: -------------- MacRuby/trunk/io.c MacRuby/trunk/string.c Modified: MacRuby/trunk/io.c =================================================================== --- MacRuby/trunk/io.c 2008-04-28 05:16:37 UTC (rev 177) +++ MacRuby/trunk/io.c 2008-04-29 01:53:23 UTC (rev 178) @@ -1845,6 +1845,7 @@ } } + RSTRING_SYNC(str); str = io_enc_str(str, fptr); if (!fptr->enc2) ENC_CODERANGE_SET(str, cr); fptr->lineno++; Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2008-04-28 05:16:37 UTC (rev 177) +++ MacRuby/trunk/string.c 2008-04-29 01:53:23 UTC (rev 178) @@ -220,13 +220,16 @@ kCFStringEncodingUTF8, false, kCFAllocatorNull); - CFStringReplaceAll((CFMutableStringRef)str, (CFStringRef)bytestr); - strptr = RSTRING_CPTR(str); - if ((const char *)dataptr == strptr - || dataptr == NULL - || strptr == NULL - || memcmp((const char *)dataptr, strptr, datalen) == 0) { - s->cfdata = NULL; + if (bytestr != NULL) { + CFStringReplaceAll((CFMutableStringRef)str, (CFStringRef)bytestr); + CFRelease(bytestr); + strptr = RSTRING_CPTR(str); + if ((const char *)dataptr == strptr + || dataptr == NULL + || strptr == NULL + || memcmp((const char *)dataptr, strptr, datalen) == 0) { + s->cfdata = NULL; + } } } } @@ -8165,7 +8168,9 @@ rb_define_method(rb_cString, "<=>", rb_str_cmp_m, 1); rb_define_method(rb_cString, "==", rb_str_equal, 1); rb_define_method(rb_cString, "eql?", rb_str_eql, 1); -#if !WITH_OBJC +#if 1 +/* FIXME remove me once we use the objc dispatch for everything +/*#if !WITH_OBJC*/ rb_define_method(rb_cString, "hash", rb_str_hash_m, 0); #endif rb_define_method(rb_cString, "casecmp", rb_str_casecmp, 1);

1 0

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

28 Apr '08

Revision: 177 http://trac.macosforge.org/projects/ruby/changeset/177 Author: lsansonetti(a)apple.com Date: 2008-04-27 22:16:37 -0700 (Sun, 27 Apr 2008) Log Message: ----------- fixing more regressions in charset find Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2008-04-27 21:22:59 UTC (rev 176) +++ MacRuby/trunk/string.c 2008-04-28 05:16:37 UTC (rev 177) @@ -4982,6 +4982,8 @@ b = exclude ? sptr + 1 : sptr; e = sptr + strlen(sptr) - 1; subset = CFCharacterSetCreateMutable(NULL); + if (p == NULL) + p = strchr(b, '-'); while (p != NULL) { if (p > b && *(p - 1) != '\\' && *(p + 1) != '\0') { CFCharacterSetAddCharactersInRange(subset, @@ -4997,9 +4999,13 @@ CFCharacterSetAddCharactersInString(subset, substr); CFRelease(substr); } - - b = p + 2; - p = strchr(b, '-'); + if (p == b) { + p = NULL; + } + else { + b = p + 2; + p = strchr(b, '-'); + } } if (b <= e) { CFStringRef substr; @@ -5134,8 +5140,8 @@ if (sflag == 0) { long n; for (n = result_range->location; - n < result_range->location + result_range->length; - n++) + n < result_range->location + result_range->length; + n++) CFStringReplace(str, CFRangeMake(n, 1), substr); } else {

1 0

[176] MacRuby/trunk
by source_changes＠macosforge.org 27 Apr '08

27 Apr '08

Revision: 176 http://trac.macosforge.org/projects/ruby/changeset/176 Author: lsansonetti(a)apple.com Date: 2008-04-27 14:22:59 -0700 (Sun, 27 Apr 2008) Log Message: ----------- fixing some regressions Modified Paths: -------------- MacRuby/trunk/parse.y MacRuby/trunk/string.c Modified: MacRuby/trunk/parse.y =================================================================== --- MacRuby/trunk/parse.y 2008-04-26 00:29:11 UTC (rev 175) +++ MacRuby/trunk/parse.y 2008-04-27 21:22:59 UTC (rev 176) @@ -7571,6 +7571,7 @@ rb_enc_name(rb_enc_get(head)), rb_enc_name(rb_enc_get(tail))); } + RSTRING_SYNC(head); rb_str_buf_append(head, tail); } Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2008-04-26 00:29:11 UTC (rev 175) +++ MacRuby/trunk/string.c 2008-04-27 21:22:59 UTC (rev 176) @@ -208,6 +208,7 @@ CFIndex datalen; const UInt8 *dataptr; CFStringRef bytestr; + const char *strptr; data = (CFDataRef)s->cfdata; datalen = CFDataGetLength(data); @@ -220,8 +221,11 @@ false, kCFAllocatorNull); CFStringReplaceAll((CFMutableStringRef)str, (CFStringRef)bytestr); - if (memcmp((const char *)dataptr, (const char *)RSTRING_CPTR(str), - datalen) == 0) { + strptr = RSTRING_CPTR(str); + if ((const char *)dataptr == strptr + || dataptr == NULL + || strptr == NULL + || memcmp((const char *)dataptr, strptr, datalen) == 0) { s->cfdata = NULL; } } @@ -5125,6 +5129,8 @@ trans_replace(CFMutableStringRef str, const CFRange *result_range, CFStringRef substr, CFRange *search_range, int sflag) { + assert(result_range->location + result_range->length + <= CFStringGetLength((CFStringRef)str)); if (sflag == 0) { long n; for (n = result_range->location; @@ -5134,9 +5140,8 @@ } 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; + search_range->length = RSTRING_CLEN(str) - search_range->location; } } @@ -5253,7 +5258,7 @@ if (RSTRING_CLEN(str) == 0) return Qnil; - + rb_str_modify(str); _ctx.orepl = repl;

1 0

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

26 Apr '08

Revision: 175 http://trac.macosforge.org/projects/ruby/changeset/175 Author: lsansonetti(a)apple.com Date: 2008-04-25 17:29:11 -0700 (Fri, 25 Apr 2008) Log Message: ----------- reverting unintentional commit Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2008-04-26 00:28:19 UTC (rev 174) +++ MacRuby/trunk/string.c 2008-04-26 00:29:11 UTC (rev 175) @@ -169,9 +169,8 @@ (CFStringRef)str, kCFStringEncodingUTF8, 0); if (data == NULL) return NULL; -#if 0 - CFMutableDataRef mdata = CFDataCreateMutableCopy(NULL, 0, data); - GC_WB(&s->cfdata, (void *)mdata); +#if 1 + GC_WB(&s->cfdata, (void *)CFDataCreateCopy(NULL, data)); CFRelease((CFTypeRef)data); #else GC_WB(&s->cfdata, (void *)data); @@ -221,10 +220,10 @@ false, kCFAllocatorNull); CFStringReplaceAll((CFMutableStringRef)str, (CFStringRef)bytestr); -// if (memcmp((const char *)dataptr, (const char *)RSTRING_CPTR(str), -// datalen) == 0) { + if (memcmp((const char *)dataptr, (const char *)RSTRING_CPTR(str), + datalen) == 0) { s->cfdata = NULL; -// } + } } }

1 0

[174] MacRuby/trunk/lib/mkmf.rb
by source_changes＠macosforge.org 26 Apr '08

26 Apr '08

Revision: 174 http://trac.macosforge.org/projects/ruby/changeset/174 Author: lsansonetti(a)apple.com Date: 2008-04-25 17:28:19 -0700 (Fri, 25 Apr 2008) Log Message: ----------- work around string#tr temporary limitation Modified Paths: -------------- MacRuby/trunk/lib/mkmf.rb Modified: MacRuby/trunk/lib/mkmf.rb =================================================================== --- MacRuby/trunk/lib/mkmf.rb 2008-04-26 00:28:10 UTC (rev 173) +++ MacRuby/trunk/lib/mkmf.rb 2008-04-26 00:28:19 UTC (rev 174) @@ -763,7 +763,10 @@ def have_header(header, &b) checking_for header do if try_cpp(cpp_include(header), &b) - $defs.push(format("-DHAVE_%s", header.tr("a-z./\055", "A-Z___"))) + # FIXME: cannot use this in MacRuby yet + #$defs.push(format("-DHAVE_%s", header.tr("a-z./\055", "A-Z___"))) + str = header.tr("a-z", "A-Z").tr("./\055", "_") + $defs.push(format("-DHAVE_%s", str)) true else false @@ -1071,7 +1074,9 @@ def create_header(header = "extconf.h") message "creating %s\n", header - sym = header.tr("a-z./\055", "A-Z___") + # FIXME: cannot use this in MacRuby yet + #sym = header.tr("a-z./\055", "A-Z___") + sym = header.tr("a-z", "A-Z").tr("./\055", "_") hdr = ["#ifndef #{sym}\n#define #{sym}\n"] for line in $defs case line

1 0

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

26 Apr '08

Revision: 173 http://trac.macosforge.org/projects/ruby/changeset/173 Author: lsansonetti(a)apple.com Date: 2008-04-25 17:28:10 -0700 (Fri, 25 Apr 2008) Log Message: ----------- work around string#tr temporary limitation Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2008-04-26 00:26:22 UTC (rev 172) +++ MacRuby/trunk/string.c 2008-04-26 00:28:10 UTC (rev 173) @@ -169,8 +169,9 @@ (CFStringRef)str, kCFStringEncodingUTF8, 0); if (data == NULL) return NULL; -#if 1 - GC_WB(&s->cfdata, (void *)CFDataCreateCopy(NULL, data)); +#if 0 + CFMutableDataRef mdata = CFDataCreateMutableCopy(NULL, 0, data); + GC_WB(&s->cfdata, (void *)mdata); CFRelease((CFTypeRef)data); #else GC_WB(&s->cfdata, (void *)data); @@ -220,10 +221,10 @@ false, kCFAllocatorNull); CFStringReplaceAll((CFMutableStringRef)str, (CFStringRef)bytestr); - if (memcmp((const char *)dataptr, (const char *)RSTRING_CPTR(str), - datalen) == 0) { +// if (memcmp((const char *)dataptr, (const char *)RSTRING_CPTR(str), +// datalen) == 0) { s->cfdata = NULL; - } +// } } }

1 0

[172] MacRuby/trunk/file.c
by source_changes＠macosforge.org 26 Apr '08

26 Apr '08

Revision: 172 http://trac.macosforge.org/projects/ruby/changeset/172 Author: lsansonetti(a)apple.com Date: 2008-04-25 17:26:22 -0700 (Fri, 25 Apr 2008) Log Message: ----------- fixing File.join Modified Paths: -------------- MacRuby/trunk/file.c Modified: MacRuby/trunk/file.c =================================================================== --- MacRuby/trunk/file.c 2008-04-25 22:11:27 UTC (rev 171) +++ MacRuby/trunk/file.c 2008-04-26 00:26:22 UTC (rev 172) @@ -3028,14 +3028,28 @@ static VALUE rb_file_join(VALUE ary, VALUE sep) { - long len, i; +#if WITH_OBJC + VALUE mstr; + if (RARRAY_LEN(ary) == 0) { + mstr = rb_str_new(0, 0); + } + else { + VALUE str; + str = (VALUE)CFStringCreateByCombiningStrings(NULL, (CFArrayRef)ary, + (CFStringRef)sep); + mstr = rb_str_dup(str); + CFRelease((CFTypeRef)str); + } + return mstr; +#else + long len, i, count; VALUE result, tmp; char *name, *tail; if (RARRAY_LEN(ary) == 0) return rb_str_new(0, 0); len = 1; - for (i=0; i<RARRAY_LEN(ary); i++) { + for (i=0, count=RARRAY_LEN(ary); i<count; i++) { if (TYPE(RARRAY_AT(ary, i)) == T_STRING) { len += RSTRING_LEN(RARRAY_AT(ary, i)); } @@ -3080,6 +3094,7 @@ } return result; +#endif } /*

1 0