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

[2885] MacRuby/trunk/gc.c
by source_changes＠macosforge.org 22 Oct '09

22 Oct '09

Revision: 2885 http://trac.macosforge.org/projects/ruby/changeset/2885 Author: lsansonetti(a)apple.com Date: 2009-10-22 14:19:58 -0700 (Thu, 22 Oct 2009) Log Message: ----------- revert r2883 Revision Links: -------------- http://trac.macosforge.org/projects/ruby/changeset/2883 Modified Paths: -------------- MacRuby/trunk/gc.c Modified: MacRuby/trunk/gc.c =================================================================== --- MacRuby/trunk/gc.c 2009-10-22 20:00:10 UTC (rev 2884) +++ MacRuby/trunk/gc.c 2009-10-22 21:19:58 UTC (rev 2885) @@ -345,6 +345,9 @@ GC_WB(&n->u2.value, a1); GC_WB(&n->u3.value, a2); + // FIXME this retain is added because the parser is NOT GC-safe at this point + GC_RETAIN(n); + return n; }

1 0

[2884] MacRuby/trunk/TODO
by source_changes＠macosforge.org 22 Oct '09

22 Oct '09

Revision: 2884 http://trac.macosforge.org/projects/ruby/changeset/2884 Author: lsansonetti(a)apple.com Date: 2009-10-22 13:00:10 -0700 (Thu, 22 Oct 2009) Log Message: ----------- refreshed Modified Paths: -------------- MacRuby/trunk/TODO Modified: MacRuby/trunk/TODO =================================================================== --- MacRuby/trunk/TODO 2009-10-22 19:59:54 UTC (rev 2883) +++ MacRuby/trunk/TODO 2009-10-22 20:00:10 UTC (rev 2884) @@ -48,7 +48,7 @@ [ ] implement ~RoxorVM [ ] fix exception leak [X] delete unused functions after execution - [ ] delete unused NODE* after execution + [X] delete unused NODE* after execution [/] thread issues [ ] method cache is not thread safe [ ] block dvars are corrupted in case the receiver leaves

1 0

[2883] MacRuby/trunk
by source_changes＠macosforge.org 22 Oct '09

22 Oct '09

Revision: 2883 http://trac.macosforge.org/projects/ruby/changeset/2883 Author: lsansonetti(a)apple.com Date: 2009-10-22 12:59:54 -0700 (Thu, 22 Oct 2009) Log Message: ----------- parser nodes are now collectable (experimental) Modified Paths: -------------- MacRuby/trunk/gc.c MacRuby/trunk/include/ruby/node.h MacRuby/trunk/include/ruby/ruby.h MacRuby/trunk/parse.y Modified: MacRuby/trunk/gc.c =================================================================== --- MacRuby/trunk/gc.c 2009-10-22 11:27:47 UTC (rev 2882) +++ MacRuby/trunk/gc.c 2009-10-22 19:59:54 UTC (rev 2883) @@ -345,9 +345,6 @@ GC_WB(&n->u2.value, a1); GC_WB(&n->u3.value, a2); - // FIXME this retain is added because the parser is NOT GC-safe at this point - GC_RETAIN(n); - return n; } @@ -989,6 +986,8 @@ static void rb_obj_imp_finalize(void *obj, SEL sel) { +//printf("FINALIZE %p %s\n", obj, class_getName(*(Class *)obj)); + #if 0 // const bool need_protection = // GET_THREAD()->thread_id != pthread_self(); Modified: MacRuby/trunk/include/ruby/node.h =================================================================== --- MacRuby/trunk/include/ruby/node.h 2009-10-22 11:27:47 UTC (rev 2882) +++ MacRuby/trunk/include/ruby/node.h 2009-10-22 19:59:54 UTC (rev 2883) @@ -417,12 +417,12 @@ #define NEW_MATCH(c) NEW_NODE(NODE_MATCH,c,0,0) #define NEW_MATCH2(n1,n2) NEW_NODE(NODE_MATCH2,n1,n2,0) #define NEW_MATCH3(r,n2) NEW_NODE(NODE_MATCH3,r,n2,0) -#define NEW_LIT(l) NEW_NODE(NODE_LIT,l,0,0) -#define NEW_STR(s) NEW_NODE(NODE_STR,s,0,0) -#define NEW_DSTR(s) NEW_NODE(NODE_DSTR,s,1,0) -#define NEW_XSTR(s) NEW_NODE(NODE_XSTR,s,0,0) -#define NEW_DXSTR(s) NEW_NODE(NODE_DXSTR,s,0,0) -#define NEW_DSYM(s) NEW_NODE(NODE_DSYM,s,0,0) +#define NEW_LIT(l) NEW_NODE(NODE_LIT,GC_RETAIN(l),0,0) +#define NEW_STR(s) NEW_NODE(NODE_STR,GC_RETAIN(s),0,0) +#define NEW_DSTR(s) NEW_NODE(NODE_DSTR,GC_RETAIN(s),1,0) +#define NEW_XSTR(s) NEW_NODE(NODE_XSTR,GC_RETAIN(s),0,0) +#define NEW_DXSTR(s) NEW_NODE(NODE_DXSTR,GC_RETAIN(s),0,0) +#define NEW_DSYM(s) NEW_NODE(NODE_DSYM,GC_RETAIN(s),0,0) #define NEW_EVSTR(n) NEW_NODE(NODE_EVSTR,0,(n),0) #if WITH_OBJC && __IN_PARSE_Y__ # define NEW_CALL(r,m,a) process_named_args(NEW_NODE(NODE_CALL,r,m,a)) Modified: MacRuby/trunk/include/ruby/ruby.h =================================================================== --- MacRuby/trunk/include/ruby/ruby.h 2009-10-22 11:27:47 UTC (rev 2882) +++ MacRuby/trunk/include/ruby/ruby.h 2009-10-22 19:59:54 UTC (rev 2883) @@ -1433,7 +1433,7 @@ } return addr; } -#define GC_RELEASE(obj) (rb_objc_retain((const void *)obj)) +#define GC_RELEASE(obj) (rb_objc_release((const void *)obj)) #if RUBY_INCLUDED_AS_FRAMEWORK #include <MacRuby/ruby/missing.h> Modified: MacRuby/trunk/parse.y =================================================================== --- MacRuby/trunk/parse.y 2009-10-22 11:27:47 UTC (rev 2882) +++ MacRuby/trunk/parse.y 2009-10-22 19:59:54 UTC (rev 2883) @@ -2036,7 +2036,7 @@ value_expr($3); if (nd_type($1) == NODE_LIT && FIXNUM_P($1->nd_lit) && nd_type($3) == NODE_LIT && FIXNUM_P($3->nd_lit)) { - GC_WB(&$1->nd_lit, rb_range_new($1->nd_lit, $3->nd_lit, Qfalse)); + GC_WB(&$1->nd_lit, GC_RETAIN(rb_range_new($1->nd_lit, $3->nd_lit, Qfalse))); $$ = $1; } else { @@ -2053,7 +2053,7 @@ value_expr($3); if (nd_type($1) == NODE_LIT && FIXNUM_P($1->nd_lit) && nd_type($3) == NODE_LIT && FIXNUM_P($3->nd_lit)) { - GC_WB(&$1->nd_lit, rb_range_new($1->nd_lit, $3->nd_lit, Qtrue)); + GC_WB(&$1->nd_lit, GC_RETAIN(rb_range_new($1->nd_lit, $3->nd_lit, Qtrue))); $$ = $1; } else { @@ -3929,7 +3929,7 @@ { VALUE src = node->nd_lit; nd_set_type(node, NODE_LIT); - GC_WB(&node->nd_lit, reg_compile(src, options)); + GC_WB(&node->nd_lit, GC_RETAIN(reg_compile(src, options))); } break; default: @@ -5179,29 +5179,21 @@ NODE* rb_compile_file(const char *f, VALUE file, int start) { - VALUE volatile vparser = rb_parser_new(); - - return rb_parser_compile_file(vparser, f, file, start); + return rb_parser_compile_file(rb_parser_new(), f, file, start); } NODE * -rb_parser_compile_file(volatile VALUE vparser, const char *f, VALUE file, +rb_parser_compile_file(VALUE vparser, const char *f, VALUE file, int start) { struct parser_params *parser; - volatile VALUE tmp; - NODE *node; - Data_Get_Struct(vparser, struct parser_params, parser); lex_gets = lex_io_gets; GC_WB(&lex_input, file); lex_pbeg = lex_p = lex_pend = 0; - node = yycompile(parser, f, start); - tmp = vparser; /* prohibit tail call optimization */ - - return node; + return yycompile(parser, f, start); } #endif /* !RIPPER */ @@ -7703,7 +7695,7 @@ int t; #if YYPURE - GC_WB(&parser->parser_yylval, (union tmpyystype*)lval); + parser->parser_yylval = (union tmpyystype*)lval; parser->parser_yylval->val = Qundef; #endif t = parser_yylex(parser); @@ -9188,7 +9180,6 @@ reg_fragment_setenc(str, options); err = rb_errinfo(); re = rb_reg_compile(str, options & RE_OPTION_MASK); - rb_objc_retain((void *)re); if (NIL_P(re)) { ID mesg = rb_intern("mesg"); VALUE m = rb_attr_get(rb_errinfo(), mesg); @@ -10079,8 +10070,16 @@ rb_parser_new(void) { struct parser_params *p = parser_new(); +#if 1 + VALUE c = rb_cData; +#else + static VALUE c = 0; + if (c == 0) { + c = rb_define_class("__Parser", rb_cObject); + } +#endif - return Data_Wrap_Struct(rb_cData, parser_mark, parser_free, p); + return Data_Wrap_Struct(c, parser_mark, parser_free, p); } VALUE

1 0

[2882] MacRuby/trunk/test_vm/dispatch.rb
by source_changes＠macosforge.org 22 Oct '09

22 Oct '09

Revision: 2882 http://trac.macosforge.org/projects/ruby/changeset/2882 Author: eloy.de.enige(a)gmail.com Date: 2009-10-22 04:27:47 -0700 (Thu, 22 Oct 2009) Log Message: ----------- Added failing test_vm test about allowing a protected method to be called with `send'. Modified Paths: -------------- MacRuby/trunk/test_vm/dispatch.rb Modified: MacRuby/trunk/test_vm/dispatch.rb =================================================================== --- MacRuby/trunk/test_vm/dispatch.rb 2009-10-22 00:36:39 UTC (rev 2881) +++ MacRuby/trunk/test_vm/dispatch.rb 2009-10-22 11:27:47 UTC (rev 2882) @@ -89,6 +89,18 @@ end } +assert ':ok', %{ + class X + def method_missing(x, *args, &block) + p :ok if x == :foo and block.call == 42 + end + + protected + def foo; end + end + X.new.send(:foo) { 42 } +} + assert "42", "def foo; return 42; end; p foo" assert "42", "def foo(x); if x; return 42; end; end; p foo(true)" assert "42", "def foo(x); if x; x += 2; return x; end; end; p foo(40)"

1 0

[2881] MacRuby/trunk/lib/rdoc/rdoc.rb
by source_changes＠macosforge.org 22 Oct '09

22 Oct '09

Revision: 2881 http://trac.macosforge.org/projects/ruby/changeset/2881 Author: lsansonetti(a)apple.com Date: 2009-10-21 17:36:39 -0700 (Wed, 21 Oct 2009) Log Message: ----------- teach rdoc to not process binary .rbo files because he's too dumb Modified Paths: -------------- MacRuby/trunk/lib/rdoc/rdoc.rb Modified: MacRuby/trunk/lib/rdoc/rdoc.rb =================================================================== --- MacRuby/trunk/lib/rdoc/rdoc.rb 2009-10-22 00:30:24 UTC (rev 2880) +++ MacRuby/trunk/lib/rdoc/rdoc.rb 2009-10-22 00:36:39 UTC (rev 2881) @@ -152,6 +152,7 @@ stat = File.stat(rel_file_name) case type = stat.ftype when "file" + next if rel_file_name[-4..-1] == '.rbo' next if @last_created and stat.mtime < @last_created if force_doc or ::RDoc::Parser.can_parse(rel_file_name) then

1 0

[2880] MacRuby/trunk/TODO
by source_changes＠macosforge.org 22 Oct '09

22 Oct '09

Revision: 2880 http://trac.macosforge.org/projects/ruby/changeset/2880 Author: lsansonetti(a)apple.com Date: 2009-10-21 17:30:24 -0700 (Wed, 21 Oct 2009) Log Message: ----------- refreshed Modified Paths: -------------- MacRuby/trunk/TODO Modified: MacRuby/trunk/TODO =================================================================== --- MacRuby/trunk/TODO 2009-10-21 23:17:31 UTC (rev 2879) +++ MacRuby/trunk/TODO 2009-10-22 00:30:24 UTC (rev 2880) @@ -31,7 +31,8 @@ [/] port all rb_num_coerce_bin() calls to rb_objc_num_coerce_bin() [/] port all rb_obj_respond_to() calls to rb_vm_respond_to() [X] refresh copyright headers for 2009 -[ ] rdoc should work +[X] rdoc should work +[ ] ri should work [X] MacRuby should not ignore SIGINT and other signals [X] fix autoload bugs [ ] Xcode target for AOT compilation @@ -46,6 +47,8 @@ [ ] leaks [ ] implement ~RoxorVM [ ] fix exception leak + [X] delete unused functions after execution + [ ] delete unused NODE* after execution [/] thread issues [ ] method cache is not thread safe [ ] block dvars are corrupted in case the receiver leaves

1 0

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

21 Oct '09

Revision: 2879 http://trac.macosforge.org/projects/ruby/changeset/2879 Author: vincent.isambart(a)gmail.com Date: 2009-10-21 16:17:31 -0700 (Wed, 21 Oct 2009) Log Message: ----------- delenda does not work on Leopard Modified Paths: -------------- MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2009-10-21 22:53:56 UTC (rev 2878) +++ MacRuby/trunk/vm.cpp 2009-10-21 23:17:31 UTC (rev 2879) @@ -435,6 +435,7 @@ { assert(func->use_empty()); +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 // Remove from cache. std::map<Function *, IMP>::iterator iter = JITcache.find(func); if (iter != JITcache.end()) { @@ -461,6 +462,7 @@ // Delete IR. func->eraseFromParent(); +#endif } bool

1 0

[2878] MacRuby/trunk
by source_changes＠macosforge.org 21 Oct '09

21 Oct '09

Revision: 2878 http://trac.macosforge.org/projects/ruby/changeset/2878 Author: eloy.de.enige(a)gmail.com Date: 2009-10-21 15:53:56 -0700 (Wed, 21 Oct 2009) Log Message: ----------- Raise a NameError when trying to remove a method in the superclass. Modified Paths: -------------- MacRuby/trunk/spec/frozen/tags/macruby/core/module/remove_method_tags.txt MacRuby/trunk/vm_method.c Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/module/remove_method_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/module/remove_method_tags.txt 2009-10-21 21:23:16 UTC (rev 2877) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/module/remove_method_tags.txt 2009-10-21 22:53:56 UTC (rev 2878) @@ -1,2 +1 @@ fails:Module#remove_method removes method from subclass, but not parent -fails:Module#remove_method raises a NameError when attempting to remove method further up the inheritance tree Modified: MacRuby/trunk/vm_method.c =================================================================== --- MacRuby/trunk/vm_method.c 2009-10-21 21:23:16 UTC (rev 2877) +++ MacRuby/trunk/vm_method.c 2009-10-21 22:53:56 UTC (rev 2878) @@ -139,7 +139,8 @@ m = class_getInstanceMethod((Class)klass, sel); } } - if (m == NULL) { + if (m == NULL + || class_getInstanceMethod((Class)RCLASS_SUPER(klass), sel) == m) { rb_name_error(mid, "method `%s' not defined in %s", rb_id2name(mid), rb_class2name(klass)); }

1 0

[2877] MacRuby/trunk/re.c
by source_changes＠macosforge.org 21 Oct '09

21 Oct '09

Revision: 2877 http://trac.macosforge.org/projects/ruby/changeset/2877 Author: lsansonetti(a)apple.com Date: 2009-10-21 14:23:16 -0700 (Wed, 21 Oct 2009) Log Message: ----------- do not leak Match objects Modified Paths: -------------- MacRuby/trunk/re.c Modified: MacRuby/trunk/re.c =================================================================== --- MacRuby/trunk/re.c 2009-10-21 20:47:01 UTC (rev 2876) +++ MacRuby/trunk/re.c 2009-10-21 21:23:16 UTC (rev 2877) @@ -845,6 +845,17 @@ return (VALUE)match; } +static IMP rb_objc_match_finalize_super = NULL; + +static void +rb_objc_match_finalize(void *rcv, SEL sel) +{ + onig_region_free(RMATCH_REGS(rcv), 0); + if (rb_objc_match_finalize_super != NULL) { + ((void(*)(void *, SEL))rb_objc_match_finalize_super)(rcv, sel); + } +} + typedef struct { int byte_pos; int char_pos; @@ -3745,6 +3756,9 @@ rb_objc_define_method(*(VALUE *)rb_cMatch, "alloc", match_alloc, 0); rb_undef_method(CLASS_OF(rb_cMatch), "new"); + rb_objc_match_finalize_super = rb_objc_install_method2((Class)rb_cMatch, + "finalize", (IMP)rb_objc_match_finalize); + rb_objc_define_method(rb_cMatch, "initialize_copy", match_init_copy, 1); rb_objc_define_method(rb_cMatch, "regexp", match_regexp, 0); rb_objc_define_method(rb_cMatch, "names", match_names, 0);

1 0

[2876] MacRuby/trunk/parse.y
by source_changes＠macosforge.org 21 Oct '09

21 Oct '09

Revision: 2876 http://trac.macosforge.org/projects/ruby/changeset/2876 Author: lsansonetti(a)apple.com Date: 2009-10-21 13:47:01 -0700 (Wed, 21 Oct 2009) Log Message: ----------- simplify some branches Modified Paths: -------------- MacRuby/trunk/parse.y Modified: MacRuby/trunk/parse.y =================================================================== --- MacRuby/trunk/parse.y 2009-10-21 20:46:32 UTC (rev 2875) +++ MacRuby/trunk/parse.y 2009-10-21 20:47:01 UTC (rev 2876) @@ -5140,29 +5140,22 @@ NODE* rb_compile_string(const char *f, VALUE s, int line) { - VALUE volatile vparser = rb_parser_new(); - - return rb_parser_compile_string(vparser, f, s, line); + return rb_parser_compile_string(rb_parser_new(), f, s, line); } NODE* -rb_parser_compile_string(volatile VALUE vparser, const char *f, VALUE s, int line) +rb_parser_compile_string(VALUE vparser, const char *f, VALUE s, int line) { struct parser_params *parser; - NODE *node; - volatile VALUE tmp; - Data_Get_Struct(vparser, struct parser_params, parser); + lex_gets = CLASS_OF(s) == rb_cByteString ? lex_get_bstr : lex_get_str; lex_gets_ptr = 0; GC_WB(&lex_input, s); lex_pbeg = lex_p = lex_pend = 0; compile_for_eval = rb_parse_in_eval(); - node = yycompile(parser, f, line); - tmp = vparser; /* prohibit tail call optimization */ - - return node; + return yycompile(parser, f, line); } NODE*

1 0