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

[1043] MacRuby/branches/experimental/array.c
by source_changes＠macosforge.org 21 Mar '09

21 Mar '09

Revision: 1043 http://trac.macosforge.org/projects/ruby/changeset/1043 Author: lsansonetti(a)apple.com Date: 2009-03-20 22:25:26 -0700 (Fri, 20 Mar 2009) Log Message: ----------- fixed Array#include? Modified Paths: -------------- MacRuby/branches/experimental/array.c Modified: MacRuby/branches/experimental/array.c =================================================================== --- MacRuby/branches/experimental/array.c 2009-03-21 05:10:26 UTC (rev 1042) +++ MacRuby/branches/experimental/array.c 2009-03-21 05:25:26 UTC (rev 1043) @@ -3593,7 +3593,7 @@ rb_objc_define_method(rb_cArray, "replace", rb_ary_replace_imp, 1); rb_objc_define_method(rb_cArray, "clear", rb_ary_clear, 0); rb_objc_define_method(rb_cArray, "fill", rb_ary_fill, -1); - rb_objc_define_method(rb_cArray, "include?", rb_ary_includes, 1); + rb_objc_define_method(rb_cArray, "include?", rb_ary_includes_imp, 1); rb_objc_define_method(rb_cArray, "<=>", rb_ary_cmp, 1); rb_objc_define_method(rb_cArray, "slice", rb_ary_aref, -1);

1 0

[1042] MacRuby/branches/experimental
by source_changes＠macosforge.org 21 Mar '09

21 Mar '09

Revision: 1042 http://trac.macosforge.org/projects/ruby/changeset/1042 Author: lsansonetti(a)apple.com Date: 2009-03-20 22:10:26 -0700 (Fri, 20 Mar 2009) Log Message: ----------- implemented rb_iter_break() Modified Paths: -------------- MacRuby/branches/experimental/include/ruby/ruby.h MacRuby/branches/experimental/roxor.cpp MacRuby/branches/experimental/roxor.h Modified: MacRuby/branches/experimental/include/ruby/ruby.h =================================================================== --- MacRuby/branches/experimental/include/ruby/ruby.h 2009-03-21 04:30:31 UTC (rev 1041) +++ MacRuby/branches/experimental/include/ruby/ruby.h 2009-03-21 05:10:26 UTC (rev 1042) @@ -939,7 +939,7 @@ PRINTF_ARGS(NORETURN(void rb_fatal(const char*, ...)), 1, 2); PRINTF_ARGS(NORETURN(void rb_bug(const char*, ...)), 1, 2); NORETURN(void rb_sys_fail(const char*)); -NORETURN(void rb_iter_break(void)); +void rb_iter_break(void); NORETURN(void rb_exit(int)); NORETURN(void rb_notimplement(void)); Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-21 04:30:31 UTC (rev 1041) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-21 05:10:26 UTC (rev 1042) @@ -1774,7 +1774,7 @@ safe_level = 0; backref = Qnil; - broken_with = 0; + broken_with = Qundef; load_path = rb_ary_new(); rb_objc_retain((void *)load_path); @@ -5345,7 +5345,7 @@ rb_vm_pop_broken_value(void) { VALUE val = GET_VM()->broken_with; - GET_VM()->broken_with = 0; + GET_VM()->broken_with = Qundef; return val; } @@ -5576,8 +5576,7 @@ void rb_iter_break(void) { - // TODO should be a #define that calls return - abort(); + GET_VM()->broken_with = Qnil; } extern "C" Modified: MacRuby/branches/experimental/roxor.h =================================================================== --- MacRuby/branches/experimental/roxor.h 2009-03-21 04:30:31 UTC (rev 1041) +++ MacRuby/branches/experimental/roxor.h 2009-03-21 05:10:26 UTC (rev 1042) @@ -152,7 +152,7 @@ #define RETURN_IF_BROKEN() \ do { \ VALUE __v = rb_vm_pop_broken_value(); \ - if (__v != 0) { \ + if (__v != Qundef) { \ return __v; \ } \ } \

1 0

[1041] MacRuby/branches/experimental
by source_changes＠macosforge.org 21 Mar '09

21 Mar '09

Revision: 1041 http://trac.macosforge.org/projects/ruby/changeset/1041 Author: lsansonetti(a)apple.com Date: 2009-03-20 21:30:31 -0700 (Fri, 20 Mar 2009) Log Message: ----------- let's raise SyntaxError exceptions when there is a parsing error instead of crashing Modified Paths: -------------- MacRuby/branches/experimental/load.c MacRuby/branches/experimental/vm_eval.c Modified: MacRuby/branches/experimental/load.c =================================================================== --- MacRuby/branches/experimental/load.c 2009-03-21 04:16:12 UTC (rev 1040) +++ MacRuby/branches/experimental/load.c 2009-03-21 04:30:31 UTC (rev 1041) @@ -267,7 +267,9 @@ // Load it. const char *fname_str = RSTRING_PTR(fname); NODE *node = (NODE *)rb_load_file(fname_str); - assert(node != NULL); + if (node == NULL) { + rb_raise(rb_eSyntaxError, "compile error"); + } rb_vm_run_node(fname_str, node); } Modified: MacRuby/branches/experimental/vm_eval.c =================================================================== --- MacRuby/branches/experimental/vm_eval.c 2009-03-21 04:16:12 UTC (rev 1040) +++ MacRuby/branches/experimental/vm_eval.c 2009-03-21 04:30:31 UTC (rev 1041) @@ -314,7 +314,9 @@ { // TODO honor scope NODE *node = rb_compile_string(file, src, line); - assert(node != NULL); + if (node == NULL) { + rb_raise(rb_eSyntaxError, "compile error"); + } return rb_vm_run_node(file, node); }

1 0

[1040] MacRuby/branches/experimental
by source_changes＠macosforge.org 21 Mar '09

21 Mar '09

Revision: 1040 http://trac.macosforge.org/projects/ruby/changeset/1040 Author: lsansonetti(a)apple.com Date: 2009-03-20 21:16:12 -0700 (Fri, 20 Mar 2009) Log Message: ----------- fixed another bug in robject slots regrowth + added a test case Modified Paths: -------------- MacRuby/branches/experimental/roxor.h MacRuby/branches/experimental/test_roxor.rb Modified: MacRuby/branches/experimental/roxor.h =================================================================== --- MacRuby/branches/experimental/roxor.h 2009-03-21 03:10:17 UTC (rev 1039) +++ MacRuby/branches/experimental/roxor.h 2009-03-21 04:16:12 UTC (rev 1040) @@ -41,13 +41,13 @@ GC_WB(&obj->slots, new_slots); } #else - VALUE *new_slots = (VALUE *)xmalloc(sizeof(VALUE) * new_num_slot); - for (i = 0; i < obj->num_slots; i++) { + VALUE *new_slots = (VALUE *)xmalloc(sizeof(VALUE) * (new_num_slot + 1)); + for (i = 0; i <= obj->num_slots; i++) { GC_WB(&new_slots[i], obj->slots[i]); } GC_WB(&obj->slots, new_slots); #endif - for (i = obj->num_slots; i < new_num_slot; i++) { + for (i = obj->num_slots + 1; i < new_num_slot; i++) { obj->slots[i] = Qundef; } obj->num_slots = new_num_slot; @@ -72,7 +72,7 @@ if (robj->num_slots < (unsigned int)slot) { rb_vm_regrow_robject_slots(robj, (unsigned int)slot); } - robj->slots[slot] = val; + GC_WB(&robj->slots[slot], val); } typedef struct { Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-03-21 03:10:17 UTC (rev 1039) +++ MacRuby/branches/experimental/test_roxor.rb 2009-03-21 04:16:12 UTC (rev 1040) @@ -1050,6 +1050,27 @@ p Foo.foo } + assert '231', %q{ + class Foo + def initialize + @v1 = 1; @v2 = 2; @v3 = 3 + @v4 = 4; @v5 = 5; @v6 = 6 + @v7 = 7; @v8 = 8; @v9 = 9 + @v10 = 10; @v11 = 11; @v12 = 12 + @v13 = 13; @v14 = 14; @v15 = 15 + @v16 = 16; @v17 = 17; @v18 = 18 + @v19 = 19; @v20 = 20; @v21 = 21 + end + def foo + @v1 + @v2 + @v3 + @v4 + @v5 + @v6 + + @v7 + @v8 + @v9 + @v10 + @v11 + @v12 + + @v13 + @v14 + @v15 + @v16 + @v17 + @v18 + + @v19 + @v20 + @v21 + end + end + p Foo.new.foo + } + end =begin

1 0

[1039] MacRuby/branches/experimental/mspec/lib/pp.rb
by source_changes＠macosforge.org 21 Mar '09

21 Mar '09

Revision: 1039 http://trac.macosforge.org/projects/ruby/changeset/1039 Author: lsansonetti(a)apple.com Date: 2009-03-20 20:10:17 -0700 (Fri, 20 Mar 2009) Log Message: ----------- added dummy pp.rb file Added Paths: ----------- MacRuby/branches/experimental/mspec/lib/pp.rb Added: MacRuby/branches/experimental/mspec/lib/pp.rb =================================================================== --- MacRuby/branches/experimental/mspec/lib/pp.rb (rev 0) +++ MacRuby/branches/experimental/mspec/lib/pp.rb 2009-03-21 03:10:17 UTC (rev 1039) @@ -0,0 +1,5 @@ +module Kernel + def pretty_inspect(obj) + puts obj.inspect + end +end

1 0

[1038] MacRuby/branches/experimental
by source_changes＠macosforge.org 21 Mar '09

21 Mar '09

Revision: 1038 http://trac.macosforge.org/projects/ruby/changeset/1038 Author: lsansonetti(a)apple.com Date: 2009-03-20 20:09:59 -0700 (Fri, 20 Mar 2009) Log Message: ----------- fixed robject slots regrowth Modified Paths: -------------- MacRuby/branches/experimental/include/ruby/ruby.h MacRuby/branches/experimental/roxor.h Modified: MacRuby/branches/experimental/include/ruby/ruby.h =================================================================== --- MacRuby/branches/experimental/include/ruby/ruby.h 2009-03-21 01:51:28 UTC (rev 1037) +++ MacRuby/branches/experimental/include/ruby/ruby.h 2009-03-21 03:09:59 UTC (rev 1038) @@ -468,7 +468,7 @@ struct RBasic basic; CFMutableDictionaryRef tbl; /* dynamic ivars (runtime) */ unsigned int num_slots; - VALUE slots[1]; /* static ivars (compilation) */ + VALUE *slots; /* static ivars (compilation) */ }; #if !WITH_OBJC Modified: MacRuby/branches/experimental/roxor.h =================================================================== --- MacRuby/branches/experimental/roxor.h 2009-03-21 01:51:28 UTC (rev 1037) +++ MacRuby/branches/experimental/roxor.h 2009-03-21 03:09:59 UTC (rev 1038) @@ -32,13 +32,21 @@ int rb_vm_find_class_ivar_slot(VALUE klass, ID name); static inline void -rb_vm_regrow_robject_slots(struct RObject *obj, int new_num_slot) +rb_vm_regrow_robject_slots(struct RObject *obj, unsigned int new_num_slot) { + unsigned int i; +#if 0 VALUE *new_slots = (VALUE *)xrealloc(obj->slots, sizeof(VALUE) * new_num_slot); if (obj->slots != new_slots) { GC_WB(&obj->slots, new_slots); } - int i; +#else + VALUE *new_slots = (VALUE *)xmalloc(sizeof(VALUE) * new_num_slot); + for (i = 0; i < obj->num_slots; i++) { + GC_WB(&new_slots[i], obj->slots[i]); + } + GC_WB(&obj->slots, new_slots); +#endif for (i = obj->num_slots; i < new_num_slot; i++) { obj->slots[i] = Qundef; } @@ -62,7 +70,7 @@ struct RObject *robj = (struct RObject *)obj; assert(slot >= 0); if (robj->num_slots < (unsigned int)slot) { - rb_vm_regrow_robject_slots(robj, slot); + rb_vm_regrow_robject_slots(robj, (unsigned int)slot); } robj->slots[slot] = val; } @@ -121,7 +129,9 @@ struct RObject *obj; int num_slots = 10; - obj = (struct RObject *)xmalloc(sizeof(struct RObject) + (num_slots * sizeof(VALUE))); + obj = (struct RObject *)xmalloc(sizeof(struct RObject)); + GC_WB(&obj->slots, xmalloc(num_slots * sizeof(VALUE))); + OBJSETUP(obj, klass, T_OBJECT); ROBJECT(obj)->tbl = NULL;

1 0

[1037] MacRuby/branches/experimental
by source_changes＠macosforge.org 21 Mar '09

21 Mar '09

Revision: 1037 http://trac.macosforge.org/projects/ruby/changeset/1037 Author: lsansonetti(a)apple.com Date: 2009-03-20 18:51:28 -0700 (Fri, 20 Mar 2009) Log Message: ----------- experimental implementation of instance_eval/instance_exec/module_eval/module_exec (works only with blocks and outer const lookup doesn't work yet) Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp MacRuby/branches/experimental/roxor.h MacRuby/branches/experimental/vm_eval.c Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-21 00:59:42 UTC (rev 1036) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-21 01:51:28 UTC (rev 1037) @@ -5175,6 +5175,26 @@ } extern "C" +VALUE +rb_vm_yield_under(VALUE klass, VALUE self, int argc, const VALUE *argv) +{ + rb_vm_block_t *b = GET_VM()->top_block(); + + GET_VM()->pop_block(); + VALUE old_self = b->self; + b->self = self; + + // TODO set klass as the default outer! + + VALUE retval = rb_vm_block_eval0(b, argc, argv); + + b->self = old_self; + GET_VM()->push_block(b); + + return retval; +} + +extern "C" VALUE rb_vm_yield_args(int argc, ...) { Modified: MacRuby/branches/experimental/roxor.h =================================================================== --- MacRuby/branches/experimental/roxor.h 2009-03-21 00:59:42 UTC (rev 1036) +++ MacRuby/branches/experimental/roxor.h 2009-03-21 01:51:28 UTC (rev 1037) @@ -26,6 +26,7 @@ VALUE rb_vm_call_with_cache2(void *cache, VALUE self, VALUE klass, SEL sel, int argc, const VALUE *argv); void *rb_vm_get_call_cache(SEL sel); VALUE rb_vm_yield(int argc, const VALUE *argv); +VALUE rb_vm_yield_under(VALUE klass, VALUE self, int argc, const VALUE *argv); bool rb_vm_respond_to(VALUE obj, SEL sel, bool priv); VALUE rb_vm_method_missing(VALUE obj, int argc, const VALUE *argv); int rb_vm_find_class_ivar_slot(VALUE klass, ID name); Modified: MacRuby/branches/experimental/vm_eval.c =================================================================== --- MacRuby/branches/experimental/vm_eval.c 2009-03-21 00:59:42 UTC (rev 1036) +++ MacRuby/branches/experimental/vm_eval.c 2009-03-21 01:51:28 UTC (rev 1037) @@ -324,6 +324,21 @@ return eval_string_with_cref(self, src, scope, 0, file, line); } +static VALUE +specific_eval(int argc, VALUE *argv, VALUE klass, VALUE self) +{ + if (rb_block_given_p()) { + if (argc > 0) { + rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc); + } + return rb_vm_yield_under(klass, self, 0, NULL); + } + else { + // TODO + abort(); + } +} + /* * call-seq: * eval(string [, binding [, filename [,lineno]]]) => obj @@ -435,11 +450,9 @@ klass = Qnil; } else { - klass = rb_singleton_class(self); + klass = CLASS_OF(self); } - // TODO - abort(); - return Qnil; + return specific_eval(argc, argv, klass, self); } /* @@ -471,9 +484,7 @@ else { klass = rb_singleton_class(self); } - // TODO - abort(); - return Qnil; + return rb_vm_yield_under(klass, self, argc, argv); } /* @@ -503,9 +514,7 @@ VALUE rb_mod_module_eval(VALUE mod, SEL sel, int argc, VALUE *argv) { - // TODO - abort(); - return Qnil; + return specific_eval(argc, argv, mod, mod); } /* @@ -529,11 +538,9 @@ */ VALUE -rb_mod_module_exec(VALUE recv, SEL sel, int argc, VALUE *argv) +rb_mod_module_exec(VALUE mod, SEL sel, int argc, VALUE *argv) { - // TODO - abort(); - return Qnil; + return rb_vm_yield_under(mod, mod, argc, argv); } /*

1 0

[1036] MacRuby/branches/experimental/mspec/lib/mspec/runner/formatters/ spinner.rb
by source_changes＠macosforge.org 21 Mar '09

21 Mar '09

Revision: 1036 http://trac.macosforge.org/projects/ruby/changeset/1036 Author: eloy.de.enige(a)gmail.com Date: 2009-03-20 17:59:42 -0700 (Fri, 20 Mar 2009) Log Message: ----------- Reverted workaround for substring assignment as this bug is now fixed. Modified Paths: -------------- MacRuby/branches/experimental/mspec/lib/mspec/runner/formatters/spinner.rb Modified: MacRuby/branches/experimental/mspec/lib/mspec/runner/formatters/spinner.rb =================================================================== --- MacRuby/branches/experimental/mspec/lib/mspec/runner/formatters/spinner.rb 2009-03-21 00:58:08 UTC (rev 1035) +++ MacRuby/branches/experimental/mspec/lib/mspec/runner/formatters/spinner.rb 2009-03-21 00:59:42 UTC (rev 1036) @@ -56,11 +56,8 @@ @percent = @loaded * 100 / @total bar = ("=" * (@percent / @ratio)).ljust @length label = "%d%%" % @percent - first_part = bar[0,@position] - last_part = bar[@position + label.size, -1] - "#{first_part}#{label}#{last_part}" - # bar[@position, label.size] = label - # bar + bar[@position, label.size] = label + bar end def spin

1 0

[1035] MacRuby/branches/experimental/array.c
by source_changes＠macosforge.org 21 Mar '09

21 Mar '09

Revision: 1035 http://trac.macosforge.org/projects/ruby/changeset/1035 Author: lsansonetti(a)apple.com Date: 2009-03-20 17:58:08 -0700 (Fri, 20 Mar 2009) Log Message: ----------- fixed Array#+ Modified Paths: -------------- MacRuby/branches/experimental/array.c Modified: MacRuby/branches/experimental/array.c =================================================================== --- MacRuby/branches/experimental/array.c 2009-03-21 00:56:04 UTC (rev 1034) +++ MacRuby/branches/experimental/array.c 2009-03-21 00:58:08 UTC (rev 1035) @@ -3602,7 +3602,7 @@ rb_objc_define_method(rb_cArray, "assoc", rb_ary_assoc, 1); rb_objc_define_method(rb_cArray, "rassoc", rb_ary_rassoc, 1); - rb_objc_define_method(rb_cArray, "+", rb_ary_plus, 1); + rb_objc_define_method(rb_cArray, "+", rb_ary_plus_imp, 1); rb_objc_define_method(rb_cArray, "*", rb_ary_times, 1); rb_objc_define_method(rb_cArray, "-", rb_ary_diff, 1);

1 0

[1034] MacRuby/branches/experimental/test_roxor.rb
by source_changes＠macosforge.org 21 Mar '09

21 Mar '09

Revision: 1034 http://trac.macosforge.org/projects/ruby/changeset/1034 Author: eloy.de.enige(a)gmail.com Date: 2009-03-20 17:56:04 -0700 (Fri, 20 Mar 2009) Log Message: ----------- Added failing test for instance_eval. Modified Paths: -------------- MacRuby/branches/experimental/test_roxor.rb Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-03-21 00:53:52 UTC (rev 1033) +++ MacRuby/branches/experimental/test_roxor.rb 2009-03-21 00:56:04 UTC (rev 1034) @@ -1096,6 +1096,8 @@ p Foo.new.bar('p foo', binding) } + assert "42", "class A; def foo; @x; end; end; x = A.new; x.instance_eval { @x = 42 }; p x.foo" + assert ":ok", "module M; module_eval 'p :ok'; end" assert ":ok", "module M; module_eval 'def self.foo; :ok; end'; end; p M.foo"

1 0