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

[3661] MacRuby/trunk
by source_changes＠macosforge.org 28 Feb '10

28 Feb '10

Revision: 3661 http://trac.macosforge.org/projects/ruby/changeset/3661 Author: eloy.de.enige(a)gmail.com Date: 2010-02-28 06:53:32 -0800 (Sun, 28 Feb 2010) Log Message: ----------- Copy the `trusted' state when creating a copy with #dup. Modified Paths: -------------- MacRuby/trunk/object.c Removed Paths: ------------- MacRuby/trunk/spec/frozen/tags/macruby/core/object/dup_tags.txt Modified: MacRuby/trunk/object.c =================================================================== --- MacRuby/trunk/object.c 2010-02-28 14:53:20 UTC (rev 3660) +++ MacRuby/trunk/object.c 2010-02-28 14:53:32 UTC (rev 3661) @@ -353,6 +353,8 @@ } dup = rb_obj_alloc(rb_obj_class(obj)); init_copy(dup, obj); + if (OBJ_UNTRUSTED(obj)) + OBJ_UNTRUST(dup); return dup; } Deleted: MacRuby/trunk/spec/frozen/tags/macruby/core/object/dup_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/object/dup_tags.txt 2010-02-28 14:53:20 UTC (rev 3660) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/object/dup_tags.txt 2010-02-28 14:53:32 UTC (rev 3661) @@ -1 +0,0 @@ -fails:Object#dup preserves untrusted state from the original

1 0

[3660] MacRuby/trunk
by source_changes＠macosforge.org 28 Feb '10

28 Feb '10

Revision: 3660 http://trac.macosforge.org/projects/ruby/changeset/3660 Author: eloy.de.enige(a)gmail.com Date: 2010-02-28 06:53:20 -0800 (Sun, 28 Feb 2010) Log Message: ----------- Delegate #copyWithZone to #dup, as we don't do anything with the zone yet. Modified Paths: -------------- MacRuby/trunk/class.c MacRuby/trunk/spec/macruby/core/object_spec.rb Modified: MacRuby/trunk/class.c =================================================================== --- MacRuby/trunk/class.c 2010-02-28 14:53:09 UTC (rev 3659) +++ MacRuby/trunk/class.c 2010-02-28 14:53:20 UTC (rev 3660) @@ -67,15 +67,13 @@ return (void *)rb_robject_allocate_instance((VALUE)rcv); } -VALUE rb_obj_init_copy(VALUE, SEL, VALUE); - static void * rb_obj_imp_copyWithZone(void *rcv, SEL sel, void *zone) { // XXX honor zone? - VALUE copy = rb_robject_allocate_instance(CLASS_OF(rcv)); - rb_obj_init_copy(copy, 0, (VALUE)rcv); - return (void *)copy; + // for now let rb_obj_dup allocate an instance, since we don't honor the + // zone yet anyways + return (void *)rb_obj_dup((VALUE)rcv); } static BOOL @@ -129,6 +127,8 @@ return rb_class_real(cl); } +VALUE rb_obj_init_copy(VALUE, SEL, VALUE); + void rb_define_object_special_methods(VALUE klass) { Modified: MacRuby/trunk/spec/macruby/core/object_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/object_spec.rb 2010-02-28 14:53:09 UTC (rev 3659) +++ MacRuby/trunk/spec/macruby/core/object_spec.rb 2010-02-28 14:53:20 UTC (rev 3660) @@ -1,7 +1,8 @@ require File.dirname(__FILE__) + "/../spec_helper" +require File.expand_path('../../../frozen/core/object/shared/dup_clone', __FILE__) + FixtureCompiler.require! "object" TestObject # force dynamic load - require File.join(FIXTURES, 'object') describe "A pure MacRuby Class" do @@ -25,3 +26,29 @@ o.initialized?.should == true end end + +# Atm we don't actually do anything with the given zone, so the current +# implementation behaves exactly like #dup. Hence, we can reuse the existing +# rubyspec specs for Object#dup. +# +# But since #dup does not take an argument, we stub the spec classes to call +# #copyWithZone from a method that doesn't take an argument either. +module ObjectSpecCopyWithZone + def copyWithZoneWithoutActualZone + copyWithZone(nil) + end +end +ObjectSpecDup.send(:include, ObjectSpecCopyWithZone) +ObjectSpecDupInitCopy.send(:include, ObjectSpecCopyWithZone) + +describe "Object#copyWithZone:" do + it_behaves_like :object_dup_clone, :copyWithZoneWithoutActualZone + + it "does not preserve frozen state from the original" do + o = ObjectSpecDupInitCopy.new + o.freeze + o2 = o.copyWithZone(nil) + + o2.frozen?.should == false + end +end \ No newline at end of file

1 0

[3659] MacRuby/trunk/rakelib
by source_changes＠macosforge.org 28 Feb '10

28 Feb '10

Revision: 3659 http://trac.macosforge.org/projects/ruby/changeset/3659 Author: eloy.de.enige(a)gmail.com Date: 2010-02-28 06:53:09 -0800 (Sun, 28 Feb 2010) Log Message: ----------- Add a compile_stdlib option for the builder, which can be set to false to skip compilation. But always AOT compile rbconfig.rb. And remove stdlib:touch. Modified Paths: -------------- MacRuby/trunk/rakelib/builder/options.rb MacRuby/trunk/rakelib/builder.rake Modified: MacRuby/trunk/rakelib/builder/options.rb =================================================================== --- MacRuby/trunk/rakelib/builder/options.rb 2010-02-28 06:57:29 UTC (rev 3658) +++ MacRuby/trunk/rakelib/builder/options.rb 2010-02-28 14:53:09 UTC (rev 3659) @@ -46,6 +46,7 @@ ENABLE_DEBUG_LOGGING = b.option('enable_debug_logging', true) { |x| x == 'true' } UNEXPORTED_SYMBOLS_LIST = b.option('unexported_symbols_list', nil) SIMULTANEOUS_JOBS = b.option('jobs', 1) { |x| x.to_i } +COMPILE_STDLIB = b.option('compile_stdlib', true) { |x| x == 'true' } # Everything below this comment should *not* be modified. Modified: MacRuby/trunk/rakelib/builder.rake =================================================================== --- MacRuby/trunk/rakelib/builder.rake 2010-02-28 06:57:29 UTC (rev 3658) +++ MacRuby/trunk/rakelib/builder.rake 2010-02-28 14:53:09 UTC (rev 3659) @@ -142,7 +142,7 @@ desc "AOT compile the stdlib" task :build => [:miniruby, 'macruby:dylib'] do archf = ARCHS.map { |x| "--arch #{x}" }.join(' ') - commands = AOT_STDLIB.map do |pattern| + commands = (COMPILE_STDLIB ? AOT_STDLIB : %w{ rbconfig.rb }).map do |pattern| Dir.glob(pattern).map do |path| out = File.join(File.dirname(path), File.basename(path, '.rb') + '.rbo') if !File.exist?(out) or File.mtime(path) > File.mtime(out) or File.mtime('./miniruby') > File.mtime(out) @@ -152,12 +152,6 @@ end.flatten.compact Builder.parallel_execute(commands) end - - desc "Touch .rbo files to ignore their build" - task :touch do - files = ["*.rbo", "lib/**/*.rbo"] - files.map { |pat| Dir.glob(pat) }.flatten.each { |p| sh "/usr/bin/touch #{p}" } - end end desc "Same as extensions"

1 0

[3658] MacRuby/branches/icu/spec/frozen/core/regexp
by source_changes＠macosforge.org 28 Feb '10

28 Feb '10

Revision: 3658 http://trac.macosforge.org/projects/ruby/changeset/3658 Author: lsansonetti(a)apple.com Date: 2010-02-27 22:57:29 -0800 (Sat, 27 Feb 2010) Log Message: ----------- skip specs using named captures Modified Paths: -------------- MacRuby/branches/icu/spec/frozen/core/regexp/named_captures_spec.rb MacRuby/branches/icu/spec/frozen/core/regexp/names_spec.rb Modified: MacRuby/branches/icu/spec/frozen/core/regexp/named_captures_spec.rb =================================================================== --- MacRuby/branches/icu/spec/frozen/core/regexp/named_captures_spec.rb 2010-02-28 06:51:19 UTC (rev 3657) +++ MacRuby/branches/icu/spec/frozen/core/regexp/named_captures_spec.rb 2010-02-28 06:57:29 UTC (rev 3658) @@ -1 +1,2 @@ -language_version __FILE__, "named_captures" +# MacRuby does not support named captures yet. +#language_version __FILE__, "named_captures" Modified: MacRuby/branches/icu/spec/frozen/core/regexp/names_spec.rb =================================================================== --- MacRuby/branches/icu/spec/frozen/core/regexp/names_spec.rb 2010-02-28 06:51:19 UTC (rev 3657) +++ MacRuby/branches/icu/spec/frozen/core/regexp/names_spec.rb 2010-02-28 06:57:29 UTC (rev 3658) @@ -1 +1,2 @@ -language_version __FILE__, "names" +# MacRuby does not support named captures yet. +#language_version __FILE__, "names"

1 0

[3657] MacRuby/branches/icu
by source_changes＠macosforge.org 28 Feb '10

28 Feb '10

Revision: 3657 http://trac.macosforge.org/projects/ruby/changeset/3657 Author: lsansonetti(a)apple.com Date: 2010-02-27 22:51:19 -0800 (Sat, 27 Feb 2010) Log Message: ----------- added bstr_concat() to be used to cat bytes, use it in marshal Modified Paths: -------------- MacRuby/branches/icu/encoding.h MacRuby/branches/icu/marshal.c MacRuby/branches/icu/string.c Modified: MacRuby/branches/icu/encoding.h =================================================================== --- MacRuby/branches/icu/encoding.h 2010-02-28 06:33:40 UTC (rev 3656) +++ MacRuby/branches/icu/encoding.h 2010-02-28 06:51:19 UTC (rev 3657) @@ -311,6 +311,7 @@ VALUE bstr_new(void); VALUE bstr_new_with_data(const uint8_t *bytes, long len); uint8_t *bstr_bytes(VALUE str); +void bstr_concat(VALUE str, const uint8_t *bytes, long len); long bstr_length(VALUE str); void bstr_set_length(VALUE str, long len); void bstr_resize(VALUE str, long capa); Modified: MacRuby/branches/icu/marshal.c =================================================================== --- MacRuby/branches/icu/marshal.c 2010-02-28 06:33:40 UTC (rev 3656) +++ MacRuby/branches/icu/marshal.c 2010-02-28 06:51:19 UTC (rev 3657) @@ -219,7 +219,7 @@ w_nbyte(const char *s, int n, struct dump_arg *arg) { VALUE buf = arg->str; - rb_str_buf_cat(buf, s, n); + bstr_concat(buf, (const uint8_t *)s, n); if (arg->dest && RSTRING_LEN(buf) >= BUFSIZ) { if (arg->taint) OBJ_TAINT(buf); rb_io_write(arg->dest, 0, buf); @@ -898,7 +898,7 @@ w_object(arg->obj, arg->arg, arg->limit); if (arg->arg->dest) { rb_io_write(arg->arg->dest, 0, arg->arg->str); - rb_str_resize(arg->arg->str, 0); + bstr_resize(arg->arg->str, 0); } return 0; } Modified: MacRuby/branches/icu/string.c =================================================================== --- MacRuby/branches/icu/string.c 2010-02-28 06:33:40 UTC (rev 3656) +++ MacRuby/branches/icu/string.c 2010-02-28 06:51:19 UTC (rev 3657) @@ -801,6 +801,18 @@ } static void +str_concat_bytes(rb_str_t *self, const char *bytes, long len) +{ + assert(bytes != NULL && len >= 0); + + const long new_length_in_bytes = self->length_in_bytes + len; + + str_resize_bytes(self, new_length_in_bytes); + memcpy(self->data.bytes + self->length_in_bytes, bytes, len); + self->length_in_bytes = new_length_in_bytes; +} + +static void str_concat_string(rb_str_t *self, rb_str_t *str) { if (str->length_in_bytes == 0) { @@ -814,15 +826,12 @@ str_must_have_compatible_encoding(self, str); str_make_same_format(self, str); - long new_length_in_bytes = self->length_in_bytes + str->length_in_bytes; // TODO: we should maybe merge flags // (if both are ASCII-only, the concatenation is ASCII-only, // though I'm not sure all the tests required are worth doing) str_unset_facultative_flags(self); - str_resize_bytes(self, new_length_in_bytes); - memcpy(self->data.bytes + self->length_in_bytes, str->data.bytes, - str->length_in_bytes); - self->length_in_bytes = new_length_in_bytes; + + str_concat_bytes(self, str->data.bytes, str->length_in_bytes); } static int @@ -3623,6 +3632,8 @@ // ByteString emulation. +#define IS_BSTR(obj) (IS_RSTR(obj) && !str_is_stored_in_uchars(RSTR(obj))) + VALUE rb_str_bstr(VALUE str) { @@ -3636,7 +3647,7 @@ uint8_t * bstr_bytes(VALUE str) { - assert(IS_RSTR(str)); + assert(IS_BSTR(str)); return (uint8_t *)RSTR(str)->data.bytes; } @@ -3658,21 +3669,28 @@ long bstr_length(VALUE str) { - assert(IS_RSTR(str)); + assert(IS_BSTR(str)); return RSTR(str)->length_in_bytes; } void +bstr_concat(VALUE str, const uint8_t *bytes, long len) +{ + assert(IS_BSTR(str)); + str_concat_bytes(RSTR(str), (const char *)bytes, len); +} + +void bstr_resize(VALUE str, long capa) { - assert(IS_RSTR(str)); + assert(IS_BSTR(str)); str_resize_bytes(RSTR(str), capa); } void bstr_set_length(VALUE str, long len) { - assert(IS_RSTR(str)); + assert(IS_BSTR(str)); assert(len <= RSTR(str)->capacity_in_bytes); RSTR(str)->length_in_bytes = len; }

1 0

[3656] MacRuby/branches/icu/string.c
by source_changes＠macosforge.org 28 Feb '10

28 Feb '10

Revision: 3656 http://trac.macosforge.org/projects/ruby/changeset/3656 Author: lsansonetti(a)apple.com Date: 2010-02-27 22:33:40 -0800 (Sat, 27 Feb 2010) Log Message: ----------- fixing a couple of bugs in #gsub and #scan Modified Paths: -------------- MacRuby/branches/icu/string.c Modified: MacRuby/branches/icu/string.c =================================================================== --- MacRuby/branches/icu/string.c 2010-02-28 06:06:58 UTC (rev 3655) +++ MacRuby/branches/icu/string.c 2010-02-28 06:33:40 UTC (rev 3656) @@ -2278,8 +2278,14 @@ int count = 0; rb_match_result_t *results = rb_reg_match_results(match, &count); assert(count > 0); - start = results[0].end; + if (results[0].beg == results[0].end) { + start = results[0].end + 1; + } + else { + start = results[0].end; + } + VALUE scan_result; if (count == 1) { scan_result = rb_reg_nth_match(0, match); @@ -2825,8 +2831,10 @@ if (!changed) { return bang ? Qnil : rstr_dup(str, 0); } - str_concat_string(RSTR(dest), - RSTR(rstr_substr(str, offset, len - offset))); + if (offset < len) { + str_concat_string(RSTR(dest), + RSTR(rstr_substr(str, offset, len - offset))); + } break; }

1 0

[3655] MacRuby/branches/icu/symbol.c
by source_changes＠macosforge.org 28 Feb '10

28 Feb '10

Revision: 3655 http://trac.macosforge.org/projects/ruby/changeset/3655 Author: lsansonetti(a)apple.com Date: 2010-02-27 22:06:58 -0800 (Sat, 27 Feb 2010) Log Message: ----------- added NSString primitives to Symbol Modified Paths: -------------- MacRuby/branches/icu/symbol.c Modified: MacRuby/branches/icu/symbol.c =================================================================== --- MacRuby/branches/icu/symbol.c 2010-02-28 06:00:59 UTC (rev 3654) +++ MacRuby/branches/icu/symbol.c 2010-02-28 06:06:58 UTC (rev 3655) @@ -14,6 +14,7 @@ #include "symbol.h" #include "ruby/node.h" #include "vm.h" +#include "objc.h" VALUE rb_cSymbol; @@ -344,6 +345,18 @@ return sym; } +static CFIndex +rsym_imp_length(void *rcv, SEL sel) +{ + return CFStringGetLength((CFStringRef)RSYM(rcv)->str); +} + +static UniChar +rsym_imp_characterAtIndex(void *rcv, SEL sel, CFIndex idx) +{ + return CFStringGetCharacterAtIndex((CFStringRef)RSYM(rcv)->str, idx); +} + void Init_Symbol(void) { @@ -366,4 +379,10 @@ rb_objc_define_method(rb_cSymbol, "description", rsym_to_s, 0); rb_objc_define_method(rb_cSymbol, "intern", rsym_to_sym, 0); rb_objc_define_method(rb_cSymbol, "to_sym", rsym_to_sym, 0); + + // Cocoa primitives. + rb_objc_install_method2((Class)rb_cSymbol, "length", + (IMP)rsym_imp_length); + rb_objc_install_method2((Class)rb_cSymbol, "characterAtIndex:", + (IMP)rsym_imp_characterAtIndex); }

1 0

[3654] MacRuby/branches/icu/string.c
by source_changes＠macosforge.org 28 Feb '10

28 Feb '10

Revision: 3654 http://trac.macosforge.org/projects/ruby/changeset/3654 Author: lsansonetti(a)apple.com Date: 2010-02-27 22:00:59 -0800 (Sat, 27 Feb 2010) Log Message: ----------- fixed an assertion Modified Paths: -------------- MacRuby/branches/icu/string.c Modified: MacRuby/branches/icu/string.c =================================================================== --- MacRuby/branches/icu/string.c 2010-02-27 10:34:16 UTC (rev 3653) +++ MacRuby/branches/icu/string.c 2010-02-28 06:00:59 UTC (rev 3654) @@ -3665,7 +3665,7 @@ bstr_set_length(VALUE str, long len) { assert(IS_RSTR(str)); - assert(len < RSTR(str)->capacity_in_bytes); + assert(len <= RSTR(str)->capacity_in_bytes); RSTR(str)->length_in_bytes = len; }

1 0

[3653] MacRuby/branches/icu/io.c
by source_changes＠macosforge.org 27 Feb '10

27 Feb '10

Revision: 3653 http://trac.macosforge.org/projects/ruby/changeset/3653 Author: lsansonetti(a)apple.com Date: 2010-02-27 02:34:16 -0800 (Sat, 27 Feb 2010) Log Message: ----------- in the meantime we support encodings in IO, let's return something meaningful in #external_encoding and #internal_encoding Modified Paths: -------------- MacRuby/branches/icu/io.c Modified: MacRuby/branches/icu/io.c =================================================================== --- MacRuby/branches/icu/io.c 2010-02-27 10:33:32 UTC (rev 3652) +++ MacRuby/branches/icu/io.c 2010-02-27 10:34:16 UTC (rev 3653) @@ -3965,7 +3965,7 @@ rb_io_external_encoding(VALUE io, SEL sel) { // TODO - return Qnil; + return (VALUE)rb_locale_encoding(); } /* @@ -3980,7 +3980,7 @@ rb_io_internal_encoding(VALUE io, SEL sel) { // TODO - return Qnil; + return (VALUE)rb_locale_encoding(); } /*

1 0

[3652] MacRuby/branches/icu
by source_changes＠macosforge.org 27 Feb '10

27 Feb '10

Revision: 3652 http://trac.macosforge.org/projects/ruby/changeset/3652 Author: lsansonetti(a)apple.com Date: 2010-02-27 02:33:32 -0800 (Sat, 27 Feb 2010) Log Message: ----------- added #chars and #each_char Modified Paths: -------------- MacRuby/branches/icu/string.c MacRuby/branches/icu/vm.h Modified: MacRuby/branches/icu/string.c =================================================================== --- MacRuby/branches/icu/string.c 2010-02-27 10:33:02 UTC (rev 3651) +++ MacRuby/branches/icu/string.c 2010-02-27 10:33:32 UTC (rev 3652) @@ -3369,6 +3369,57 @@ return str; } +/* + * Document-method: chars + * call-seq: + * str.chars => anEnumerator + * str.chars {|substr| block } => str + * + * Returns an enumerator that gives each character in the string. + * If a block is given, it iterates over each character in the string. + * + * "foo".chars.to_a #=> ["f","o","o"] + */ + +/* + * Document-method: each_char + * call-seq: + * str.each_char {|cstr| block } => str + * + * Passes each character in <i>str</i> to the given block. + * + * "hello".each_char {|c| print c, ' ' } + * + * <em>produces:</em> + * + * h e l l o + */ + +static VALUE +rstr_each_char(VALUE str, SEL sel) +{ + RETURN_ENUMERATOR(str, 0, 0); + + UChar *chars = NULL; + long chars_len = 0; + bool need_free = false; + rb_str_get_uchars(str, &chars, &chars_len, &need_free); + + for (long i = 0; i < chars_len; i++) { + VALUE charstr = rb_unicode_str_new(&chars[i], 1); + rb_yield(charstr); + ENSURE_AND_RETURN_IF_BROKEN( + if (need_free) free(chars) + ); + } + + if (need_free) { + free(chars); + } + + return str; +} + // NSString primitives. static void @@ -3511,6 +3562,8 @@ rb_objc_define_method(rb_cRubyString, "rstrip!", rstr_rstrip_bang, 0); rb_objc_define_method(rb_cRubyString, "lines", rstr_each_line, -1); rb_objc_define_method(rb_cRubyString, "each_line", rstr_each_line, -1); + rb_objc_define_method(rb_cRubyString, "chars", rstr_each_char, 0); + rb_objc_define_method(rb_cRubyString, "each_char", rstr_each_char, 0); // Added for MacRuby (debugging). rb_objc_define_method(rb_cRubyString, "__chars_count__", Modified: MacRuby/branches/icu/vm.h =================================================================== --- MacRuby/branches/icu/vm.h 2010-02-27 10:33:02 UTC (rev 3651) +++ MacRuby/branches/icu/vm.h 2010-02-27 10:33:32 UTC (rev 3652) @@ -468,6 +468,16 @@ } \ while (0) +#define ENSURE_AND_RETURN_IF_BROKEN(code) \ + do { \ + VALUE __v = rb_vm_pop_broken_value(); \ + if (__v != Qundef) { \ + code; \ + return __v; \ + } \ + } \ + while (0) + void rb_vm_finalize(void); void rb_vm_load_bridge_support(const char *path, const char *framework_path,

1 0