October 2009 - macruby-changes - lists.macosforge.org

[2795] MacRuby/trunk/vm.cpp
by source_changes＠macosforge.org 14 Oct '09

14 Oct '09

Revision: 2795 http://trac.macosforge.org/projects/ruby/changeset/2795 Author: lsansonetti(a)apple.com Date: 2009-10-14 13:12:47 -0700 (Wed, 14 Oct 2009) Log Message: ----------- added autoload check to the VM const get primitive Modified Paths: -------------- MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2009-10-14 05:20:16 UTC (rev 2794) +++ MacRuby/trunk/vm.cpp 2009-10-14 20:12:47 UTC (rev 2795) @@ -959,9 +959,13 @@ // Search the given class. CFDictionaryRef iv_dict = rb_class_ivar_dict(klass); if (iv_dict != NULL) { +retry: VALUE value; if (CFDictionaryGetValueIfPresent(iv_dict, (const void *)id, (const void **)&value)) { + if (value == Qundef && RTEST(rb_autoload_load(klass, id))) { + goto retry; + } return value; } } @@ -970,7 +974,8 @@ if (mods != Qnil) { int i, count = RARRAY_LEN(mods); for (i = 0; i < count; i++) { - VALUE val = rb_const_get_direct(RARRAY_AT(mods, i), id); + VALUE mod = RARRAY_AT(mods, i); + VALUE val = rb_const_get_direct(mod, id); if (val != Qundef) { return val; }

1 0

[2794] MacRuby/trunk/TODO
by source_changes＠macosforge.org 14 Oct '09

14 Oct '09

Revision: 2794 http://trac.macosforge.org/projects/ruby/changeset/2794 Author: lsansonetti(a)apple.com Date: 2009-10-13 22:20:16 -0700 (Tue, 13 Oct 2009) Log Message: ----------- refreshed Modified Paths: -------------- MacRuby/trunk/TODO Modified: MacRuby/trunk/TODO =================================================================== --- MacRuby/trunk/TODO 2009-10-14 05:12:50 UTC (rev 2793) +++ MacRuby/trunk/TODO 2009-10-14 05:20:16 UTC (rev 2794) @@ -31,7 +31,7 @@ [X] refresh copyright headers for 2009 [ ] rdoc should work [X] MacRuby should not ignore SIGINT and other signals -[ ] implement autoload +[X] fix autoload bugs [ ] Xcode target for AOT compilation [/] finish AOT compiler (only normal mode) [ ] macrubyc should handle -arch

1 0

[2793] MacRuby/trunk/lib/rubygems/source_index.rb
by source_changes＠macosforge.org 14 Oct '09

14 Oct '09

Revision: 2793 http://trac.macosforge.org/projects/ruby/changeset/2793 Author: lsansonetti(a)apple.com Date: 2009-10-13 22:12:50 -0700 (Tue, 13 Oct 2009) Log Message: ----------- remove hack now that #autoload is working Modified Paths: -------------- MacRuby/trunk/lib/rubygems/source_index.rb Modified: MacRuby/trunk/lib/rubygems/source_index.rb =================================================================== --- MacRuby/trunk/lib/rubygems/source_index.rb 2009-10-14 05:12:15 UTC (rev 2792) +++ MacRuby/trunk/lib/rubygems/source_index.rb 2009-10-14 05:12:50 UTC (rev 2793) @@ -7,11 +7,9 @@ require 'rubygems' require 'rubygems/user_interaction' require 'rubygems/specification' -# MacRuby doesn't support autoload yet. -#module Gem -# autoload(:SpecFetcher, 'rubygems/spec_fetcher') -#end -require 'rubygems/spec_fetcher' +module Gem + autoload(:SpecFetcher, 'rubygems/spec_fetcher') +end ## # The SourceIndex object indexes all the gems available from a

1 0

[2792] MacRuby/trunk/load.c
by source_changes＠macosforge.org 14 Oct '09

14 Oct '09

Revision: 2792 http://trac.macosforge.org/projects/ruby/changeset/2792 Author: lsansonetti(a)apple.com Date: 2009-10-13 22:12:15 -0700 (Tue, 13 Oct 2009) Log Message: ----------- implement rb_provided() Modified Paths: -------------- MacRuby/trunk/load.c Modified: MacRuby/trunk/load.c =================================================================== --- MacRuby/trunk/load.c 2009-10-14 02:11:51 UTC (rev 2791) +++ MacRuby/trunk/load.c 2009-10-14 05:12:15 UTC (rev 2792) @@ -35,7 +35,14 @@ int rb_provided(const char *feature) { - // TODO + VALUE ary = get_loaded_features(); + for (int i = 0, count = RARRAY_LEN(ary); i < count; i++) { + VALUE path = RARRAY_AT(ary, i); + // TODO: this is very naive + if (strstr(RSTRING_PTR(path), feature) != NULL) { + return true; + } + } return false; }

1 0

[2791] MacRuby/trunk/TODO
by source_changes＠macosforge.org 14 Oct '09

14 Oct '09

Revision: 2791 http://trac.macosforge.org/projects/ruby/changeset/2791 Author: lsansonetti(a)apple.com Date: 2009-10-13 19:11:51 -0700 (Tue, 13 Oct 2009) Log Message: ----------- refreshed Modified Paths: -------------- MacRuby/trunk/TODO Modified: MacRuby/trunk/TODO =================================================================== --- MacRuby/trunk/TODO 2009-10-14 02:06:19 UTC (rev 2790) +++ MacRuby/trunk/TODO 2009-10-14 02:11:51 UTC (rev 2791) @@ -34,6 +34,10 @@ [ ] implement autoload [ ] Xcode target for AOT compilation [/] finish AOT compiler (only normal mode) + [ ] macrubyc should handle -arch + [ ] support #require calls when assembling a binary + [ ] add a flag to link against libmacruby.dylib (and not .a) when + assembling a binary [X] sync with LLVM 2.6/ToT [ ] non-ASCII regexp [ ] leaks

1 0

[2790] MacRuby/trunk
by source_changes＠macosforge.org 14 Oct '09

14 Oct '09

Revision: 2790 http://trac.macosforge.org/projects/ruby/changeset/2790 Author: lsansonetti(a)apple.com Date: 2009-10-13 19:06:19 -0700 (Tue, 13 Oct 2009) Log Message: ----------- fixing some #autoload bugs Modified Paths: -------------- MacRuby/trunk/load.c MacRuby/trunk/variable.c MacRuby/trunk/vm.cpp MacRuby/trunk/vm.h Modified: MacRuby/trunk/load.c =================================================================== --- MacRuby/trunk/load.c 2009-10-13 23:38:08 UTC (rev 2789) +++ MacRuby/trunk/load.c 2009-10-14 02:06:19 UTC (rev 2790) @@ -330,7 +330,7 @@ */ static VALUE -rb_mod_autoload_p(VALUE mod, VALUE sym) +rb_mod_autoload_p(VALUE mod, SEL sel, VALUE sym) { return rb_autoload_p(mod, rb_to_id(sym)); } @@ -349,15 +349,11 @@ static VALUE rb_f_autoload(VALUE obj, SEL sel, VALUE sym, VALUE file) { -#if 0 - VALUE klass = rb_vm_cbase(); - if (NIL_P(klass)) { - rb_raise(rb_eTypeError, "Can not set autoload on singleton class"); + VALUE klass = (VALUE)rb_vm_get_current_class(); + if (klass == 0) { + klass = rb_cObject; } - return rb_mod_autoload(klass, sym, file); -#endif - // TODO - return Qnil; + return rb_mod_autoload(klass, 0, sym, file); } /* @@ -367,16 +363,11 @@ static VALUE rb_f_autoload_p(VALUE obj, SEL sel, VALUE sym) { -#if 0 - /* use rb_vm_cbase() as same as rb_f_autoload. */ - VALUE klass = rb_vm_cbase(); - if (NIL_P(klass)) { - return Qnil; + VALUE klass = (VALUE)rb_vm_get_current_class(); + if (klass == 0) { + klass = rb_cObject; } - return rb_mod_autoload_p(klass, sym); -#endif - // TODO - return Qnil; + return rb_mod_autoload_p(klass, 0, sym); } void Modified: MacRuby/trunk/variable.c =================================================================== --- MacRuby/trunk/variable.c 2009-10-13 23:38:08 UTC (rev 2789) +++ MacRuby/trunk/variable.c 2009-10-14 02:06:19 UTC (rev 2790) @@ -1453,11 +1453,7 @@ GC_WB(&DATA_PTR(av), tbl); } fn = rb_str_new2(file); -#if __LP64__ - RCLASS_RC_FLAGS(fn) &= ~FL_TAINT; -#else - FL_UNSET(fn, FL_TAINT); -#endif + rb_obj_untaint(fn); OBJ_FREEZE(fn); st_insert(tbl, id, (st_data_t)rb_node_newnode(NODE_MEMO, fn, rb_safe_level(), 0)); } Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2009-10-13 23:38:08 UTC (rev 2789) +++ MacRuby/trunk/vm.cpp 2009-10-14 02:06:19 UTC (rev 2790) @@ -3890,6 +3890,13 @@ } extern "C" +Class +rb_vm_get_current_class(void) +{ + return GET_VM()->get_current_class(); +} + +extern "C" void rb_vm_set_current_scope(VALUE mod, rb_vm_scope_t scope) { Modified: MacRuby/trunk/vm.h =================================================================== --- MacRuby/trunk/vm.h 2009-10-13 23:38:08 UTC (rev 2789) +++ MacRuby/trunk/vm.h 2009-10-14 02:06:19 UTC (rev 2790) @@ -382,6 +382,7 @@ void rb_vm_set_abort_on_exception(bool flag); Class rb_vm_set_current_class(Class klass); +Class rb_vm_get_current_class(void); bool rb_vm_is_multithreaded(void); void rb_vm_set_multithreaded(bool flag);

1 0

[2789] MacRuby/trunk/string.c
by source_changes＠macosforge.org 13 Oct '09

13 Oct '09

Revision: 2789 http://trac.macosforge.org/projects/ruby/changeset/2789 Author: neeracher(a)apple.com Date: 2009-10-13 16:38:08 -0700 (Tue, 13 Oct 2009) Log Message: ----------- Survive str.isEqual(nil) Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2009-10-13 23:34:59 UTC (rev 2788) +++ MacRuby/trunk/string.c 2009-10-13 23:38:08 UTC (rev 2789) @@ -5290,7 +5290,7 @@ { bool flag; PREPARE_RCV(rcv); - flag = CFEqual((CFTypeRef)rcv, (CFTypeRef)other); + flag = other && CFEqual((CFTypeRef)rcv, (CFTypeRef)other); RESTORE_RCV(rcv); return flag; }

1 0

[2788] MacRuby/trunk/ext/libyaml/rubyext.c
by source_changes＠macosforge.org 13 Oct '09

13 Oct '09

Revision: 2788 http://trac.macosforge.org/projects/ruby/changeset/2788 Author: neeracher(a)apple.com Date: 2009-10-13 16:34:59 -0700 (Tue, 13 Oct 2009) Log Message: ----------- Don't print non-specific tag for quoted scalars Modified Paths: -------------- MacRuby/trunk/ext/libyaml/rubyext.c Modified: MacRuby/trunk/ext/libyaml/rubyext.c =================================================================== --- MacRuby/trunk/ext/libyaml/rubyext.c 2009-10-13 05:58:35 UTC (rev 2787) +++ MacRuby/trunk/ext/libyaml/rubyext.c 2009-10-13 23:34:59 UTC (rev 2788) @@ -730,7 +730,7 @@ int can_omit_tag = 0; yaml_char_t *tag = rb_yaml_tag_or_null(taguri, &can_omit_tag); yaml_scalar_event_initialize(&ev, NULL, tag, output, RSTRING_LEN(val), - can_omit_tag, 0, rb_symbol_to_scalar_style(style)); + can_omit_tag, can_omit_tag, rb_symbol_to_scalar_style(style)); yaml_emitter_emit(emitter, &ev); return self;

1 0

[2787] MacRuby/trunk/ext/libyaml/rubyext.c
by source_changes＠macosforge.org 13 Oct '09

13 Oct '09

Revision: 2787 http://trac.macosforge.org/projects/ruby/changeset/2787 Author: lsansonetti(a)apple.com Date: 2009-10-12 22:58:35 -0700 (Mon, 12 Oct 2009) Log Message: ----------- implement :inline format for YAML sequences and mappings (patch by Matthias Neeracher) Modified Paths: -------------- MacRuby/trunk/ext/libyaml/rubyext.c Modified: MacRuby/trunk/ext/libyaml/rubyext.c =================================================================== --- MacRuby/trunk/ext/libyaml/rubyext.c 2009-10-13 03:48:56 UTC (rev 2786) +++ MacRuby/trunk/ext/libyaml/rubyext.c 2009-10-13 05:58:35 UTC (rev 2787) @@ -104,6 +104,7 @@ static ID id_plain; static ID id_quote2; +static ID id_inline; static SEL sel_to_yaml; static SEL sel_call; @@ -527,6 +528,32 @@ return style; } +static yaml_scalar_style_t +rb_symbol_to_sequence_style(VALUE sym) +{ + yaml_sequence_style_t style = YAML_ANY_SEQUENCE_STYLE; + if (NIL_P(sym)) { + return style; + } + else if (rb_to_id(sym) == id_inline) { + style = YAML_FLOW_SEQUENCE_STYLE; + } + return style; +} + +static yaml_scalar_style_t +rb_symbol_to_mapping_style(VALUE sym) +{ + yaml_mapping_style_t style = YAML_ANY_MAPPING_STYLE; + if (NIL_P(sym)) { + return style; + } + else if (rb_to_id(sym) == id_inline) { + style = YAML_FLOW_MAPPING_STYLE; + } + return style; +} + static yaml_char_t* rb_yaml_tag_or_null(VALUE tagstr, int *can_omit_tag) { @@ -663,7 +690,7 @@ int can_omit_tag = 0; yaml_char_t *tag = rb_yaml_tag_or_null(taguri, &can_omit_tag); yaml_sequence_start_event_initialize(&ev, NULL, tag, can_omit_tag, - YAML_ANY_SEQUENCE_STYLE); + rb_symbol_to_sequence_style(style)); yaml_emitter_emit(emitter, &ev); rb_yield(self); @@ -682,7 +709,7 @@ int can_omit_tag = 0; yaml_char_t *tag = rb_yaml_tag_or_null(taguri, &can_omit_tag); yaml_mapping_start_event_initialize(&ev, NULL, tag, can_omit_tag, - YAML_ANY_MAPPING_STYLE); + rb_symbol_to_mapping_style(style)); yaml_emitter_emit(emitter, &ev); rb_yield(self); @@ -775,6 +802,7 @@ { id_plain = rb_intern("plain"); id_quote2 = rb_intern("quote2"); + id_inline = rb_intern("inline"); sel_to_yaml = sel_registerName("to_yaml:"); sel_call = sel_registerName("call:");

1 0

[2786] MacRuby/trunk/TODO
by source_changes＠macosforge.org 13 Oct '09

13 Oct '09

Revision: 2786 http://trac.macosforge.org/projects/ruby/changeset/2786 Author: lsansonetti(a)apple.com Date: 2009-10-12 20:48:56 -0700 (Mon, 12 Oct 2009) Log Message: ----------- refreshed Modified Paths: -------------- MacRuby/trunk/TODO Modified: MacRuby/trunk/TODO =================================================================== --- MacRuby/trunk/TODO 2009-10-13 03:48:44 UTC (rev 2785) +++ MacRuby/trunk/TODO 2009-10-13 03:48:56 UTC (rev 2786) @@ -8,7 +8,7 @@ [X] Array subclass for immediates [ ] Hash subclass for immediates [ ] try/catch should use a C++ exception -[ ] implement 'protected' visibility +[X] implement 'protected' visibility [ ] remaining Cocoa bugs [X] ObjC exceptions should be catchable in Ruby [X] honor BridgeSupport sel_of_type attribute

1 0