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

[171] MacRuby/trunk
by source_changes＠macosforge.org 25 Apr '08

25 Apr '08

Revision: 171 http://trac.macosforge.org/projects/ruby/changeset/171 Author: lsansonetti(a)apple.com Date: 2008-04-25 15:11:27 -0700 (Fri, 25 Apr 2008) Log Message: ----------- fixing regressions in String#rindex Modified Paths: -------------- MacRuby/trunk/string.c MacRuby/trunk/test/ruby/test_string.rb Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2008-04-25 21:50:50 UTC (rev 170) +++ MacRuby/trunk/string.c 2008-04-25 22:11:27 UTC (rev 171) @@ -2661,6 +2661,14 @@ { #if WITH_OBJC CFRange r; + long sublen, strlen; + sublen = RSTRING_CLEN(sub); + strlen = RSTRING_CLEN(str); + if (sublen == 0 && strlen == 0) + return 0; + if (pos <= sublen) { + pos = strlen < sublen ? strlen : sublen; + } return (CFStringFindWithOptions((CFStringRef)str, (CFStringRef)sub, CFRangeMake(0, pos+1), Modified: MacRuby/trunk/test/ruby/test_string.rb =================================================================== --- MacRuby/trunk/test/ruby/test_string.rb 2008-04-25 21:50:50 UTC (rev 170) +++ MacRuby/trunk/test/ruby/test_string.rb 2008-04-25 22:11:27 UTC (rev 171) @@ -764,6 +764,9 @@ assert_nil(S("hello").rindex(?z)) assert_nil(S("hello").rindex(S("z"))) assert_nil(S("hello").rindex(/z./)) + + assert_equal(0, S("hello").rindex(S("hello"), 0)) + assert_equal(0, S("").rindex(S(""), 0)) end def test_rjust

1 0

[170] MacRuby/trunk
by source_changes＠macosforge.org 25 Apr '08

25 Apr '08

Revision: 170 http://trac.macosforge.org/projects/ruby/changeset/170 Author: lsansonetti(a)apple.com Date: 2008-04-25 14:50:50 -0700 (Fri, 25 Apr 2008) Log Message: ----------- fixing some regressions Modified Paths: -------------- MacRuby/trunk/file.c MacRuby/trunk/string.c Modified: MacRuby/trunk/file.c =================================================================== --- MacRuby/trunk/file.c 2008-04-24 02:54:51 UTC (rev 169) +++ MacRuby/trunk/file.c 2008-04-25 21:50:50 UTC (rev 170) @@ -2563,6 +2563,7 @@ FilePathValue(fname); s = StringValuePtr(fname); + BUFINIT(); tainted = OBJ_TAINTED(fname); @@ -2650,8 +2651,11 @@ #endif else if (!is_absolute_path(s)) { if (!NIL_P(dname)) { + long n; file_expand_path(dname, Qnil, result); BUFINIT(); + n = RSTRING_CLEN(result); + BUFCHECK(n + 2 > buflen); } else { char *dir = my_getcwd(); @@ -2751,6 +2755,7 @@ if (tainted) OBJ_TAINT(result); rb_str_set_len(result, p - buf); RSTRING_SYNC(result); + return result; } Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2008-04-24 02:54:51 UTC (rev 169) +++ MacRuby/trunk/string.c 2008-04-25 21:50:50 UTC (rev 170) @@ -1547,7 +1547,7 @@ { #if WITH_OBJC long n = CFStringGetLength((CFStringRef)str); - CFStringRef substr; + CFStringRef substr, msubstr; if (beg < 0) beg += n; if (beg > n || beg < 0) @@ -1562,8 +1562,10 @@ substr = CFStringCreateWithSubstring(NULL, (CFStringRef)str, CFRangeMake(beg, len)); } - CFMakeCollectable((CFTypeRef)substr); - return (VALUE)substr; + msubstr = (CFStringRef)CFStringCreateMutableCopy(NULL, 0, substr); + CFRelease(substr); + CFMakeCollectable(msubstr); + return (VALUE)msubstr; #else VALUE str2 = rb_str_new5(str, RSTRING_PTR(str)+beg, len); @@ -1732,13 +1734,7 @@ if (slen != len) { struct rb_objc_str_struct *s; - if (len > slen) { - CFStringPad((CFMutableStringRef)str, CFSTR(" "), len, 0); - } - else { - CFStringDelete((CFMutableStringRef)str, - CFRangeMake(len, slen - len)); - } + CFStringPad((CFMutableStringRef)str, CFSTR(" "), len, 0); s = rb_objc_str_get_struct(str); if (s != NULL && s->cfdata != NULL) @@ -3865,6 +3861,8 @@ rb_backref_set(match); #if WITH_OBJC if (bang) { + RSTRING_SYNC(str); + RSTRING_SYNC(dest); CFStringReplaceAll((CFMutableStringRef)str, (CFStringRef)dest); } else { @@ -5248,6 +5246,8 @@ if (RSTRING_CLEN(str) == 0) return Qnil; + rb_str_modify(str); + _ctx.orepl = repl; _ctx.src = RSTRING_CPTR(src); _ctx.repl = RSTRING_CPTR(repl);

1 0

[169] MacRuby/trunk/tool/compile_prelude.rb
by source_changes＠macosforge.org 24 Apr '08

24 Apr '08

Revision: 169 http://trac.macosforge.org/projects/ruby/changeset/169 Author: lsansonetti(a)apple.com Date: 2008-04-23 19:54:51 -0700 (Wed, 23 Apr 2008) Log Message: ----------- disabling pack calls for now Modified Paths: -------------- MacRuby/trunk/tool/compile_prelude.rb Modified: MacRuby/trunk/tool/compile_prelude.rb =================================================================== --- MacRuby/trunk/tool/compile_prelude.rb 2008-04-24 02:53:42 UTC (rev 168) +++ MacRuby/trunk/tool/compile_prelude.rb 2008-04-24 02:54:51 UTC (rev 169) @@ -16,8 +16,11 @@ "\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

[168] MacRuby/trunk/re.c
by source_changes＠macosforge.org 24 Apr '08

24 Apr '08

Revision: 168 http://trac.macosforge.org/projects/ruby/changeset/168 Author: lsansonetti(a)apple.com Date: 2008-04-23 19:53:42 -0700 (Wed, 23 Apr 2008) Log Message: ----------- fixing #quote Modified Paths: -------------- MacRuby/trunk/re.c Modified: MacRuby/trunk/re.c =================================================================== --- MacRuby/trunk/re.c 2008-04-24 01:21:55 UTC (rev 167) +++ MacRuby/trunk/re.c 2008-04-24 02:53:42 UTC (rev 168) @@ -2649,13 +2649,14 @@ rb_reg_quote(VALUE str) { rb_encoding *enc = rb_enc_get(str); - char *s, *send, *t; + const char *s, *send; + char *t; VALUE tmp; int c, clen; int ascii_only = rb_enc_str_asciionly_p(str); - s = RSTRING_PTR(str); - send = s + RSTRING_LEN(str); + s = RSTRING_CPTR(str); + send = s + RSTRING_CLEN(str); while (s < send) { c = rb_enc_ascget(s, send, &clen, enc); if (c == -1) { @@ -2680,7 +2681,7 @@ return str; meta_found: - tmp = rb_str_new(0, RSTRING_LEN(str)*2); + tmp = rb_str_new(0, RSTRING_CLEN(str)*2); if (ascii_only) { rb_enc_associate(tmp, rb_usascii_encoding()); } @@ -2689,8 +2690,8 @@ } t = RSTRING_PTR(tmp); /* copy upto metacharacter */ - memcpy(t, RSTRING_PTR(str), s - RSTRING_PTR(str)); - t += s - RSTRING_PTR(str); + memcpy(t, RSTRING_CPTR(str), s - RSTRING_CPTR(str)); + t += s - RSTRING_CPTR(str); while (s < send) { c = rb_enc_ascget(s, send, &clen, enc); @@ -2738,6 +2739,7 @@ *t++ = c; } rb_str_resize(tmp, t - RSTRING_PTR(tmp)); + RSTRING_SYNC(tmp); OBJ_INFECT(tmp, str); return tmp; }

1 0

[167] MacRuby/trunk
by source_changes＠macosforge.org 24 Apr '08

24 Apr '08

Revision: 167 http://trac.macosforge.org/projects/ruby/changeset/167 Author: lsansonetti(a)apple.com Date: 2008-04-23 18:21:55 -0700 (Wed, 23 Apr 2008) Log Message: ----------- misc fixed Modified Paths: -------------- MacRuby/trunk/encoding.c MacRuby/trunk/string.c Modified: MacRuby/trunk/encoding.c =================================================================== --- MacRuby/trunk/encoding.c 2008-04-23 22:54:02 UTC (rev 166) +++ MacRuby/trunk/encoding.c 2008-04-24 01:21:55 UTC (rev 167) @@ -758,7 +758,11 @@ int rb_enc_mbclen(const char *p, const char *e, rb_encoding *enc) { +#if WITH_OBJC + int n = 1; +#else int n = ONIGENC_PRECISE_MBC_ENC_LEN(enc, (UChar*)p, (UChar*)e); +#endif if (MBCLEN_CHARFOUND_P(n) && MBCLEN_CHARFOUND_LEN(n) <= e-p) return MBCLEN_CHARFOUND_LEN(n); else { Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2008-04-23 22:54:02 UTC (rev 166) +++ MacRuby/trunk/string.c 2008-04-24 01:21:55 UTC (rev 167) @@ -6206,10 +6206,14 @@ #define YIELD_SUBSTR(range) \ do { \ + VALUE mcopy; \ substr = CFStringCreateWithSubstring(NULL, (CFStringRef)str, \ range); \ - CFMakeCollectable((CFTypeRef)substr); \ - rb_yield((VALUE)substr); \ + mcopy = (VALUE)CFStringCreateMutableCopy(NULL, 0, \ + (CFStringRef)substr); \ + CFMakeCollectable((CFTypeRef)mcopy); \ + rb_yield(mcopy); \ + CFRelease(substr); \ } \ while (0)

1 0

[166] MacRuby/trunk
by source_changes＠macosforge.org 23 Apr '08

23 Apr '08

Revision: 166 http://trac.macosforge.org/projects/ruby/changeset/166 Author: lsansonetti(a)apple.com Date: 2008-04-23 15:54:02 -0700 (Wed, 23 Apr 2008) Log Message: ----------- fixing String subclassing/metaclassing Modified Paths: -------------- MacRuby/trunk/class.c MacRuby/trunk/io.c MacRuby/trunk/string.c Modified: MacRuby/trunk/class.c =================================================================== --- MacRuby/trunk/class.c 2008-04-23 22:53:34 UTC (rev 165) +++ MacRuby/trunk/class.c 2008-04-23 22:54:02 UTC (rev 166) @@ -103,6 +103,7 @@ void rb_objc_install_array_primitives(Class); void rb_objc_install_hash_primitives(Class); +void rb_objc_install_string_primitives(Class); static VALUE rb_objc_alloc_class(const char *name, VALUE super, VALUE flags, VALUE klass) @@ -148,7 +149,8 @@ if (name == NULL) FL_SET(obj, RCLASS_ANONYMOUS); - if (rb_cArray != 0 && rb_cHash != 0 && ocsuper != NULL) { + if (rb_cArray != 0 && rb_cHash != 0 && rb_cString != 0 + && ocsuper != NULL) { do { if (ocsuper == RCLASS_OCID(rb_cArray)) { rb_objc_install_array_primitives(ocklass); @@ -158,6 +160,10 @@ rb_objc_install_hash_primitives(ocklass); break; } + if (ocsuper == RCLASS_OCID(rb_cString)) { + rb_objc_install_string_primitives(ocklass); + break; + } ocsuper = class_getSuperclass(ocsuper); } while (ocsuper != NULL); Modified: MacRuby/trunk/io.c =================================================================== --- MacRuby/trunk/io.c 2008-04-23 22:53:34 UTC (rev 165) +++ MacRuby/trunk/io.c 2008-04-23 22:54:02 UTC (rev 166) @@ -798,7 +798,7 @@ return rb_funcall(io, id_write, 1, str); } io = tmp; - if (RSTRING_LEN(str) == 0) return INT2FIX(0); + if (RSTRING_CLEN(str) == 0) return INT2FIX(0); GetOpenFile(io, fptr); rb_io_check_writable(fptr); Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2008-04-23 22:53:34 UTC (rev 165) +++ MacRuby/trunk/string.c 2008-04-23 22:54:02 UTC (rev 166) @@ -2364,6 +2364,9 @@ #endif } +#if WITH_OBJC +static bool rb_objc_str_is_pure(VALUE); +#endif /* * call-seq: @@ -2387,6 +2390,14 @@ return rb_equal(str2, str1); } #if WITH_OBJC + if (!rb_objc_str_is_pure(str2)) { + /* This is to work around a strange bug in CFEqual's objc + * dispatching. + */ + VALUE tmp = str1; + str1 = str2; + str2 = tmp; + } if (CFEqual((CFTypeRef)str1, (CFTypeRef)str2)) return Qtrue; #else @@ -4272,10 +4283,6 @@ * Returns the receiver. */ -#if WITH_OBJC -static bool rb_objc_str_is_pure(VALUE); -#endif - static VALUE rb_str_to_s(VALUE str) { @@ -7977,11 +7984,124 @@ ? __nscfstring = (Class)objc_getClass("NSCFString") \ : __nscfstring) +#define PREPARE_RCV(x) \ + Class old = *(Class *)x; \ + *(Class *)x = NSCFSTRING(); + +#define RESTORE_RCV(x) \ + *(Class *)x = old; + static bool rb_objc_str_is_pure(VALUE str) { return *(Class *)str == NSCFSTRING(); } + +static CFIndex +imp_rb_str_length(void *rcv, SEL sel) +{ + CFIndex length; + PREPARE_RCV(rcv); + length = CFStringGetLength((CFStringRef)rcv); + RESTORE_RCV(rcv); + return length; +} + +static UniChar +imp_rb_str_characterAtIndex(void *rcv, SEL sel, CFIndex idx) +{ + UniChar character; + PREPARE_RCV(rcv); + character = CFStringGetCharacterAtIndex((CFStringRef)rcv, idx); + RESTORE_RCV(rcv); + return character; +} + +static void +imp_rb_str_getCharactersRange(void *rcv, SEL sel, UniChar *buffer, + CFRange range) +{ + PREPARE_RCV(rcv); + CFStringGetCharacters((CFStringRef)rcv, range, buffer); + RESTORE_RCV(rcv); +} + +static void +imp_rb_str_replaceCharactersInRangeWithString(void *rcv, SEL sel, + CFRange range, void *str) +{ + PREPARE_RCV(rcv); + CFStringReplace((CFMutableStringRef)rcv, range, (CFStringRef)str); + RESTORE_RCV(rcv); +} + +static const UniChar * +imp_rb_str_fastCharacterContents(void *rcv, SEL sel) +{ + const UniChar *ptr; + PREPARE_RCV(rcv); + ptr = CFStringGetCharactersPtr((CFStringRef)rcv); + RESTORE_RCV(rcv); + return ptr; +} + +static const char * +imp_rb_str_fastCStringContents(void *rcv, SEL sel, bool nullTerminaisonRequired) +{ + const char *cstr; + PREPARE_RCV(rcv); + cstr = CFStringGetCStringPtr((CFStringRef)rcv, 0); + /* XXX nullTerminaisonRequired should perhaps be honored */ + RESTORE_RCV(rcv); + return cstr; +} + +static CFStringEncoding +imp_rb_str_fastestEncodingInCFStringEncoding(void *rcv, SEL sel) +{ + CFStringEncoding encoding; + PREPARE_RCV(rcv); + encoding = CFStringGetFastestEncoding((CFStringRef)rcv); + RESTORE_RCV(rcv); + return encoding; +} + +static bool +imp_rb_str_isEqual(void *rcv, SEL sel, void *other) +{ + bool flag; + PREPARE_RCV(rcv); + flag = CFEqual((CFTypeRef)rcv, (CFTypeRef)other); + RESTORE_RCV(rcv); + return flag; +} + +void +rb_objc_install_string_primitives(Class klass) +{ +#define INSTALL_METHOD(selname, imp) \ + do { \ + SEL sel = sel_registerName(selname); \ + Method method = class_getInstanceMethod(klass, sel); \ + assert(method != NULL); \ + assert(class_addMethod(klass, sel, (IMP)imp, \ + method_getTypeEncoding(method))); \ + } \ + while(0) + + INSTALL_METHOD("length", imp_rb_str_length); + INSTALL_METHOD("characterAtIndex:", imp_rb_str_characterAtIndex); + INSTALL_METHOD("getCharacters:range:", imp_rb_str_getCharactersRange); + INSTALL_METHOD("replaceCharactersInRange:withString:", + imp_rb_str_replaceCharactersInRangeWithString); + INSTALL_METHOD("_fastCharacterContents", imp_rb_str_fastCharacterContents); + INSTALL_METHOD("_fastCStringContents:", imp_rb_str_fastCStringContents); + INSTALL_METHOD("_fastestEncodingInCFStringEncoding", + imp_rb_str_fastestEncodingInCFStringEncoding); + INSTALL_METHOD("isEqual:", imp_rb_str_isEqual); + +#undef INSTALL_METHOD +} #endif /*

1 0

[165] MacRuby/trunk/mkconfig.rb
by source_changes＠macosforge.org 23 Apr '08

23 Apr '08

Revision: 165 http://trac.macosforge.org/projects/ruby/changeset/165 Author: lsansonetti(a)apple.com Date: 2008-04-23 15:53:34 -0700 (Wed, 23 Apr 2008) Log Message: ----------- revert a debug change Modified Paths: -------------- MacRuby/trunk/mkconfig.rb Modified: MacRuby/trunk/mkconfig.rb =================================================================== --- MacRuby/trunk/mkconfig.rb 2008-04-23 01:29:13 UTC (rev 164) +++ MacRuby/trunk/mkconfig.rb 2008-04-23 22:53:34 UTC (rev 165) @@ -22,9 +22,6 @@ end $stdout = config -puts "hello" -exit - fast = {'prefix'=>TRUE, 'ruby_install_name'=>TRUE, 'INSTALL'=>TRUE, 'EXEEXT'=>TRUE} print %[ # This file was created by #{mkconfig} when ruby was built. Any

1 0

[164] MacRuby/trunk
by source_changes＠macosforge.org 23 Apr '08

23 Apr '08

Revision: 164 http://trac.macosforge.org/projects/ruby/changeset/164 Author: lsansonetti(a)apple.com Date: 2008-04-22 18:29:13 -0700 (Tue, 22 Apr 2008) Log Message: ----------- misc fixes Modified Paths: -------------- MacRuby/trunk/class.c MacRuby/trunk/mkconfig.rb MacRuby/trunk/re.c MacRuby/trunk/string.c MacRuby/trunk/vm_insnhelper.c Modified: MacRuby/trunk/class.c =================================================================== --- MacRuby/trunk/class.c 2008-04-22 21:44:07 UTC (rev 163) +++ MacRuby/trunk/class.c 2008-04-23 01:29:13 UTC (rev 164) @@ -1101,6 +1101,7 @@ else { klass = rb_make_metaclass(obj, RBASIC(obj)->klass); } +#if !WITH_OBJC if (OBJ_TAINTED(obj)) { OBJ_TAINT(klass); } @@ -1108,6 +1109,7 @@ FL_UNSET(klass, FL_TAINT); } if (OBJ_FROZEN(obj)) OBJ_FREEZE(klass); +#endif ALLOW_INTS; return klass; Modified: MacRuby/trunk/mkconfig.rb =================================================================== --- MacRuby/trunk/mkconfig.rb 2008-04-22 21:44:07 UTC (rev 163) +++ MacRuby/trunk/mkconfig.rb 2008-04-23 01:29:13 UTC (rev 164) @@ -22,6 +22,9 @@ end $stdout = config +puts "hello" +exit + fast = {'prefix'=>TRUE, 'ruby_install_name'=>TRUE, 'INSTALL'=>TRUE, 'EXEEXT'=>TRUE} print %[ # This file was created by #{mkconfig} when ruby was built. Any Modified: MacRuby/trunk/re.c =================================================================== --- MacRuby/trunk/re.c 2008-04-22 21:44:07 UTC (rev 163) +++ MacRuby/trunk/re.c 2008-04-23 01:29:13 UTC (rev 164) @@ -2973,18 +2973,18 @@ rb_reg_regsub(VALUE str, VALUE src, struct re_registers *regs, VALUE regexp) { VALUE val = 0; - char *p, *s, *e; + const char *p, *s, *e; int no, clen; rb_encoding *str_enc = rb_enc_get(str); rb_encoding *src_enc = rb_enc_get(src); rb_enc_check(str, src); - p = s = RSTRING_PTR(str); - e = s + RSTRING_LEN(str); + p = s = RSTRING_CPTR(str); + e = s + RSTRING_CLEN(str); while (s < e) { int c = rb_enc_ascget(s, e, &clen, str_enc); - char *ss; + const char *ss; if (c == -1) { s += mbclen(s, e, str_enc); @@ -3023,7 +3023,7 @@ case 'k': if (s < e && rb_enc_ascget(s, e, &clen, str_enc) == '<') { - char *name, *name_end; + const char *name, *name_end; name_end = name = s + clen; while (name_end < e) { @@ -3050,11 +3050,11 @@ break; case '`': - rb_enc_str_buf_cat(val, RSTRING_PTR(src), BEG(0), src_enc); + rb_enc_str_buf_cat(val, RSTRING_CPTR(src), BEG(0), src_enc); continue; case '\'': - rb_enc_str_buf_cat(val, RSTRING_PTR(src)+END(0), RSTRING_LEN(src)-END(0), src_enc); + rb_enc_str_buf_cat(val, RSTRING_CPTR(src)+END(0), RSTRING_CLEN(src)-END(0), src_enc); continue; case '+': @@ -3075,7 +3075,7 @@ if (no >= 0) { if (no >= regs->num_regs) continue; if (BEG(no) == -1) continue; - rb_enc_str_buf_cat(val, RSTRING_PTR(src)+BEG(no), END(no)-BEG(no), src_enc); + rb_enc_str_buf_cat(val, RSTRING_CPTR(src)+BEG(no), END(no)-BEG(no), src_enc); } } Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2008-04-22 21:44:07 UTC (rev 163) +++ MacRuby/trunk/string.c 2008-04-23 01:29:13 UTC (rev 164) @@ -8022,7 +8022,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 rb_define_method(rb_cString, "hash", rb_str_hash_m, 0); +#endif rb_define_method(rb_cString, "casecmp", rb_str_casecmp, 1); rb_define_method(rb_cString, "+", rb_str_plus, 1); rb_define_method(rb_cString, "*", rb_str_times, 1); Modified: MacRuby/trunk/vm_insnhelper.c =================================================================== --- MacRuby/trunk/vm_insnhelper.c 2008-04-22 21:44:07 UTC (rev 163) +++ MacRuby/trunk/vm_insnhelper.c 2008-04-23 01:29:13 UTC (rev 164) @@ -1089,7 +1089,7 @@ rb_id2name(id), rb_obj_classname(obj)); } - if (OBJ_FROZEN(obj)) { + if (rb_obj_frozen_p(obj)) { rb_error_frozen("object"); }

1 0

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

22 Apr '08

Revision: 163 http://trac.macosforge.org/projects/ruby/changeset/163 Author: lsansonetti(a)apple.com Date: 2008-04-22 14:44:07 -0700 (Tue, 22 Apr 2008) Log Message: ----------- fixed line parser Modified Paths: -------------- MacRuby/trunk/parse.y Modified: MacRuby/trunk/parse.y =================================================================== --- MacRuby/trunk/parse.y 2008-04-22 21:17:15 UTC (rev 162) +++ MacRuby/trunk/parse.y 2008-04-22 21:44:07 UTC (rev 163) @@ -4792,7 +4792,7 @@ lex_get_str(struct parser_params *parser, VALUE s) { #if WITH_OBJC - long beg, n; + long beg, len, n; CFRange search_range; VALUE v; @@ -4808,10 +4808,12 @@ CFRangeMake(beg, n - beg), 0, &search_range)) { - lex_gets_ptr = search_range.location; + lex_gets_ptr = search_range.location + 1; + len = search_range.location - beg; } else { - lex_gets_ptr = n; + lex_gets_ptr = n; + len = lex_gets_ptr - beg; } v = (VALUE)CFStringCreateWithSubstring(NULL, (CFStringRef)s, CFRangeMake(beg, lex_gets_ptr - beg));

1 0

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

22 Apr '08

Revision: 162 http://trac.macosforge.org/projects/ruby/changeset/162 Author: lsansonetti(a)apple.com Date: 2008-04-22 14:17:15 -0700 (Tue, 22 Apr 2008) Log Message: ----------- better bytestring sync behavior, fixed buf cat Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2008-04-22 21:16:39 UTC (rev 161) +++ MacRuby/trunk/string.c 2008-04-22 21:17:15 UTC (rev 162) @@ -200,19 +200,30 @@ void rb_str_bytesync(VALUE str) { - CFDataRef data; - data = (CFDataRef)rb_str_cfdata2(str); - if (data != NULL) { + struct rb_objc_str_struct *s; + + s = rb_objc_str_get_struct2(str); + if (s != NULL && s->cfdata != NULL) { + CFDataRef data; CFIndex datalen; + const UInt8 *dataptr; + CFStringRef bytestr; + + data = (CFDataRef)s->cfdata; datalen = CFDataGetLength(data); - CFStringRef bytestr = CFStringCreateWithBytesNoCopy( + dataptr = CFDataGetBytePtr(data); + bytestr = CFStringCreateWithBytesNoCopy( NULL, - CFDataGetBytePtr((CFDataRef)data), + dataptr, datalen, kCFStringEncodingUTF8, false, kCFAllocatorNull); CFStringReplaceAll((CFMutableStringRef)str, (CFStringRef)bytestr); + if (memcmp((const char *)dataptr, (const char *)RSTRING_CPTR(str), + datalen) == 0) { + s->cfdata = NULL; + } } } @@ -1974,8 +1985,13 @@ rb_enc_str_buf_cat(VALUE str, const char *ptr, long len, rb_encoding *ptr_enc) { #if WITH_OBJC - VALUE s = rb_enc_str_new(ptr, len, ptr_enc); - CFStringAppend((CFMutableStringRef)str, (CFStringRef)s); + if (strlen(ptr) != len) { + char *tmp = (char *)alloca(len); + strncpy(tmp, ptr, len); + tmp[len] = '\0'; + ptr = tmp; + } + CFStringAppendCString((CFMutableStringRef)str, ptr, kCFStringEncodingUTF8); return str; #else return rb_enc_cr_str_buf_cat(str, ptr, len, @@ -3658,6 +3674,7 @@ #endif rb_str_modify(str); #if WITH_OBJC + RSTRING_SYNC(str); rb_str_splice_0(str, BEG(0), END(0) - BEG(0), repl); if (rb_obj_tainted(repl)) rb_str_taint(str);

1 0