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

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

22 Mar '09

Revision: 1063 http://trac.macosforge.org/projects/ruby/changeset/1063 Author: lsansonetti(a)apple.com Date: 2009-03-22 14:17:15 -0700 (Sun, 22 Mar 2009) Log Message: ----------- added a test which currently segv the compiler Modified Paths: -------------- MacRuby/branches/experimental/test_roxor.rb Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-03-22 20:37:41 UTC (rev 1062) +++ MacRuby/branches/experimental/test_roxor.rb 2009-03-22 21:17:15 UTC (rev 1063) @@ -766,6 +766,15 @@ f {|*args| p args} } + assert ':ok', %{ + 1.times do + def foo(&a) + a.call + end + foo { p :ok } + end + } + end test "blocks" do

1 0

[1062] MacRuby/branches/experimental/io.c
by source_changes＠macosforge.org 22 Mar '09

22 Mar '09

Revision: 1062 http://trac.macosforge.org/projects/ruby/changeset/1062 Author: lsansonetti(a)apple.com Date: 2009-03-22 13:37:41 -0700 (Sun, 22 Mar 2009) Log Message: ----------- re-implemented backquotes Modified Paths: -------------- MacRuby/branches/experimental/io.c Modified: MacRuby/branches/experimental/io.c =================================================================== --- MacRuby/branches/experimental/io.c 2009-03-22 19:39:00 UTC (rev 1061) +++ MacRuby/branches/experimental/io.c 2009-03-22 20:37:41 UTC (rev 1062) @@ -367,6 +367,12 @@ if (close_write && io_struct->writeStream != NULL) { CFWriteStreamClose(io_struct->writeStream); } + if (io_struct->fp != NULL) { + const int status = pclose(io_struct->fp); + io_struct->fp = NULL; + // TODO find out the real pid instead of passing -1 + rb_last_status_set(status, -1); + } } int @@ -1548,7 +1554,6 @@ io_close(VALUE io, bool close_read, bool close_write) { rb_io_t *io_struct = ExtractIOStruct(io); - io_struct_close(io_struct, close_read, close_write); } @@ -2903,7 +2908,12 @@ static VALUE rb_f_backquote(VALUE obj, SEL sel, VALUE str) { -rb_notimplement(); + VALUE io = rb_io_s_popen(rb_cIO, 0, 1, &str); + VALUE bstr = rb_bytestring_new(); + rb_io_read_all(ExtractIOStruct(io), bstr); + rb_io_close(io, 0); + + return bstr; }

1 0

[1061] MacRuby/branches/experimental/io.c
by source_changes＠macosforge.org 22 Mar '09

22 Mar '09

Revision: 1061 http://trac.macosforge.org/projects/ruby/changeset/1061 Author: lsansonetti(a)apple.com Date: 2009-03-22 12:39:00 -0700 (Sun, 22 Mar 2009) Log Message: ----------- reverted r1059 because it's bad (breaks #require) Modified Paths: -------------- MacRuby/branches/experimental/io.c Modified: MacRuby/branches/experimental/io.c =================================================================== --- MacRuby/branches/experimental/io.c 2009-03-22 19:09:29 UTC (rev 1060) +++ MacRuby/branches/experimental/io.c 2009-03-22 19:39:00 UTC (rev 1061) @@ -240,6 +240,38 @@ #define IS_PREP_STDIO(f) ((f)->mode & FMODE_PREP) #define PREP_STDIO_NAME(f) ((f)->path) +static inline int +rb_io_modenum_flags(int mode) +{ + int flags = 0; + + switch (mode & (O_RDONLY|O_WRONLY|O_RDWR)) { + case O_RDONLY: + flags = FMODE_READABLE; + break; + case O_WRONLY: + flags = FMODE_WRITABLE; + break; + case O_RDWR: + flags = FMODE_READWRITE; + break; + } + + if (mode & O_APPEND) { + flags |= FMODE_APPEND; + } + if (mode & O_CREAT) { + flags |= FMODE_CREATE; + } +#ifdef O_BINARY + if (mode & O_BINARY) { + flags |= FMODE_BINMODE; + } +#endif + + return flags; +} + /* * call-seq: * IO.try_convert(obj) -> io or nil @@ -341,7 +373,6 @@ rb_io_fptr_finalize(rb_io_t *io_struct) { io_struct_close(io_struct, true, true); - if(io_struct->fp != NULL) pclose(io_struct->fp); return 1; } @@ -1058,12 +1089,7 @@ static VALUE rb_io_gets_m(VALUE io, SEL sel, int argc, VALUE *argv) { - VALUE separator, limit; - rb_scan_args(argc, argv, "02", &separator, &limit); - // TODO: Actually take the separator into account. - VALUE result = rb_io_gets(io, sel); - rb_lastline_set(result); // TODO: Implement this in roxor - return result; + rb_notimplement(); } /* @@ -1624,7 +1650,7 @@ if (path != NULL && strcmp(path, "-") != 0) { klass = rb_cFile; } - return prep_io(fd, convert_fmode_to_oflags(mode), klass); + return prep_io(fd, rb_io_modenum_flags(mode), klass); } static VALUE

1 0

[1060] MacRuby/branches/experimental
by source_changes＠macosforge.org 22 Mar '09

22 Mar '09

Revision: 1060 http://trac.macosforge.org/projects/ruby/changeset/1060 Author: lsansonetti(a)apple.com Date: 2009-03-22 12:09:29 -0700 (Sun, 22 Mar 2009) Log Message: ----------- more block fixes Modified Paths: -------------- MacRuby/branches/experimental/eval.c MacRuby/branches/experimental/roxor.cpp MacRuby/branches/experimental/roxor.h MacRuby/branches/experimental/vm_eval.c Modified: MacRuby/branches/experimental/eval.c =================================================================== --- MacRuby/branches/experimental/eval.c 2009-03-22 16:36:42 UTC (rev 1059) +++ MacRuby/branches/experimental/eval.c 2009-03-22 19:09:29 UTC (rev 1060) @@ -448,7 +448,7 @@ static VALUE rb_f_block_given_p(VALUE self, SEL sel) { - return rb_block_given_p() ? Qtrue : Qfalse; + return rb_vm_block_saved() ? Qtrue : Qfalse; } VALUE rb_eThreadError; Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-22 16:36:42 UTC (rev 1059) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-22 19:09:29 UTC (rev 1060) @@ -400,6 +400,7 @@ unsigned char method_missing_reason; rb_vm_block_t *current_block; rb_vm_block_t *previous_block; // only used for non-Ruby created blocks + bool block_saved; // used by block_given? RoxorVM(void); @@ -1774,6 +1775,7 @@ current_block = NULL; previous_block = NULL; + block_saved = false; load_path = rb_ary_new(); rb_objc_retain((void *)load_path); @@ -4696,7 +4698,7 @@ extern "C" VALUE -rb_vm_dispatch(struct mcache *cache, VALUE self, SEL sel, void *block, +rb_vm_dispatch(struct mcache *cache, VALUE self, SEL sel, rb_vm_block_t *block, unsigned char opt, int argc, ...) { #define MAX_DISPATCH_ARGS 200 @@ -4741,17 +4743,17 @@ argc = real_argc; } - if (block != NULL) { - rb_vm_block_t *b = (rb_vm_block_t *)block; - rb_vm_block_t *old_b = GET_VM()->current_block; - GET_VM()->current_block = b; - VALUE retval = - __rb_vm_dispatch(cache, self, NULL, sel, opt, argc, argv); - GET_VM()->current_block = old_b; - return retval; - } + rb_vm_block_t *b = (rb_vm_block_t *)block; + rb_vm_block_t *old_b = GET_VM()->current_block; + bool old_block_saved = GET_VM()->block_saved; + GET_VM()->block_saved = old_b != NULL; + GET_VM()->current_block = b; - return __rb_vm_dispatch(cache, self, NULL, sel, opt, argc, argv); + VALUE retval = __rb_vm_dispatch(cache, self, NULL, sel, opt, argc, argv); + + GET_VM()->current_block = old_b; + GET_VM()->block_saved = old_block_saved; + return retval; } extern "C" @@ -4961,6 +4963,7 @@ return GET_VM()->method_cache_get(sel, false); } +// Should be used inside a method implementation. extern "C" int rb_block_given_p(void) @@ -4968,7 +4971,15 @@ return GET_VM()->current_block != NULL ? Qtrue : Qfalse; } +// Should only be used by #block_given?. extern "C" +bool +rb_vm_block_saved(void) +{ + return GET_VM()->block_saved; +} + +extern "C" rb_vm_block_t * rb_vm_current_block(void) { Modified: MacRuby/branches/experimental/roxor.h =================================================================== --- MacRuby/branches/experimental/roxor.h 2009-03-22 16:36:42 UTC (rev 1059) +++ MacRuby/branches/experimental/roxor.h 2009-03-22 19:09:29 UTC (rev 1060) @@ -112,6 +112,7 @@ rb_vm_block_t *rb_vm_prepare_block(void *llvm_function, NODE *node, VALUE self, int dvars_size, ...); rb_vm_block_t *rb_vm_current_block(void); +bool rb_vm_block_saved(void); void rb_vm_change_current_block(rb_vm_block_t *block); void rb_vm_restore_current_block(void); VALUE rb_vm_block_eval(rb_vm_block_t *block, int argc, const VALUE *argv); Modified: MacRuby/branches/experimental/vm_eval.c =================================================================== --- MacRuby/branches/experimental/vm_eval.c 2009-03-22 16:36:42 UTC (rev 1059) +++ MacRuby/branches/experimental/vm_eval.c 2009-03-22 19:09:29 UTC (rev 1060) @@ -283,7 +283,7 @@ if (cache == NULL) { cache = rb_vm_get_call_cache(sel); } - VALUE val = rb_vm_call_with_cache2(cache, obj, 0, sel, argc, argv); + VALUE val = rb_vm_call_with_cache2(cache, obj, 0, sel, argc, argv); rb_vm_restore_current_block(); return val; }

1 0

[1059] MacRuby/branches/experimental/io.c
by source_changes＠macosforge.org 22 Mar '09

22 Mar '09

Revision: 1059 http://trac.macosforge.org/projects/ruby/changeset/1059 Author: pthomson(a)apple.com Date: 2009-03-22 09:36:42 -0700 (Sun, 22 Mar 2009) Log Message: ----------- Removed a redundant method, made the IO finalizer call pclose() if necessary, and reenabled IO#gets. Modified Paths: -------------- MacRuby/branches/experimental/io.c Modified: MacRuby/branches/experimental/io.c =================================================================== --- MacRuby/branches/experimental/io.c 2009-03-22 10:14:47 UTC (rev 1058) +++ MacRuby/branches/experimental/io.c 2009-03-22 16:36:42 UTC (rev 1059) @@ -240,38 +240,6 @@ #define IS_PREP_STDIO(f) ((f)->mode & FMODE_PREP) #define PREP_STDIO_NAME(f) ((f)->path) -static inline int -rb_io_modenum_flags(int mode) -{ - int flags = 0; - - switch (mode & (O_RDONLY|O_WRONLY|O_RDWR)) { - case O_RDONLY: - flags = FMODE_READABLE; - break; - case O_WRONLY: - flags = FMODE_WRITABLE; - break; - case O_RDWR: - flags = FMODE_READWRITE; - break; - } - - if (mode & O_APPEND) { - flags |= FMODE_APPEND; - } - if (mode & O_CREAT) { - flags |= FMODE_CREATE; - } -#ifdef O_BINARY - if (mode & O_BINARY) { - flags |= FMODE_BINMODE; - } -#endif - - return flags; -} - /* * call-seq: * IO.try_convert(obj) -> io or nil @@ -373,6 +341,7 @@ rb_io_fptr_finalize(rb_io_t *io_struct) { io_struct_close(io_struct, true, true); + if(io_struct->fp != NULL) pclose(io_struct->fp); return 1; } @@ -1089,7 +1058,12 @@ static VALUE rb_io_gets_m(VALUE io, SEL sel, int argc, VALUE *argv) { - rb_notimplement(); + VALUE separator, limit; + rb_scan_args(argc, argv, "02", &separator, &limit); + // TODO: Actually take the separator into account. + VALUE result = rb_io_gets(io, sel); + rb_lastline_set(result); // TODO: Implement this in roxor + return result; } /* @@ -1650,7 +1624,7 @@ if (path != NULL && strcmp(path, "-") != 0) { klass = rb_cFile; } - return prep_io(fd, rb_io_modenum_flags(mode), klass); + return prep_io(fd, convert_fmode_to_oflags(mode), klass); } static VALUE

1 0

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

22 Mar '09

Revision: 1058 http://trac.macosforge.org/projects/ruby/changeset/1058 Author: vincent.isambart(a)gmail.com Date: 2009-03-22 03:14:47 -0700 (Sun, 22 Mar 2009) Log Message: ----------- added argument passing (failing) tests Modified Paths: -------------- MacRuby/branches/experimental/test_roxor.rb Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-03-22 07:04:43 UTC (rev 1057) +++ MacRuby/branches/experimental/test_roxor.rb 2009-03-22 10:14:47 UTC (rev 1058) @@ -712,6 +712,20 @@ p f(1, 2, 3, 4, 5, 6, 7) } assert "42", "def f((a, b)); a end; p f([42, 53])" + assert "42", "def f((a, b)); a end; p f([42, 53, 64])" # ignore additional elements in the array + assert "[42, nil]", "def f((a, b)); [a, b] end; p f([42])" # not used args are set to nil + assert "[1, 2, [], 3, nil]\n[1, 2, [], 3, 4]\n[1, 2, [3], 4, 5]", %{ + def f((x, y, *a, b, c)); [x, y, a, b, c] end + p f([1, 2, 3]) + p f([1, 2, 3, 4]) + p f([1, 2, 3, 4, 5]) + } + assert "true", %{ + class A; def to_ary; [42]; end; end + def f((*a)); a; end; + p f(A.new) == [42] + } # to_ary (not to_a) is called on non-Array objects + assert "true", %{def f((*a)); a; end; o = Object.new; p f(o) == [o]} # objects without to_ary are just passed in a one element array assert ":ok", "def f(x = 1) :ko; end; def f() end; begin p f(1); rescue ArgumentError; p :ok; end" assert ":ok", "def f(x) :ko; end; def f() end; begin p f(1); rescue ArgumentError; p :ok; end"

1 0

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

22 Mar '09

Revision: 1057 http://trac.macosforge.org/projects/ruby/changeset/1057 Author: vincent.isambart(a)gmail.com Date: 2009-03-22 00:04:43 -0700 (Sun, 22 Mar 2009) Log Message: ----------- fixed a test Modified Paths: -------------- MacRuby/branches/experimental/test_roxor.rb Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-03-22 03:15:56 UTC (rev 1056) +++ MacRuby/branches/experimental/test_roxor.rb 2009-03-22 07:04:43 UTC (rev 1057) @@ -849,7 +849,7 @@ assert "true", "def foo; p block_given?; end; foo {}" assert "false", "def foo; p block_given?; end; foo" - assert "true", "def foo; p block_given?; end; def bar; foo; end; bar {}" + assert "false", "def foo; p block_given?; end; def bar; foo; end; bar {}" assert ':ok', "def foo; yield; end; begin; foo; rescue LocalJumpError; p :ok; end"

1 0

[1056] MacRuby/branches/experimental/rakelib/spec.rake
by source_changes＠macosforge.org 22 Mar '09

22 Mar '09

Revision: 1056 http://trac.macosforge.org/projects/ruby/changeset/1056 Author: eloy.de.enige(a)gmail.com Date: 2009-03-21 20:15:56 -0700 (Sat, 21 Mar 2009) Log Message: ----------- Make sure rake does not stop executing specs if one fails. Modified Paths: -------------- MacRuby/branches/experimental/rakelib/spec.rake Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-22 02:28:17 UTC (rev 1055) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-22 03:15:56 UTC (rev 1056) @@ -20,7 +20,7 @@ desc "Run language examples with a workaround which uses mspec-run on each individual spec" task :language do Dir.glob('spec/frozen/language/**/*_spec.rb').each do |spec| - sh "#{MSPEC}-run #{spec}" + sh "#{MSPEC}-run #{spec}" rescue nil end end end

1 0

[1055] MacRuby/branches/experimental
by source_changes＠macosforge.org 22 Mar '09

22 Mar '09

Revision: 1055 http://trac.macosforge.org/projects/ruby/changeset/1055 Author: lsansonetti(a)apple.com Date: 2009-03-21 19:28:17 -0700 (Sat, 21 Mar 2009) Log Message: ----------- do not stack blocks since this doesn't go well with the ruby semantics Modified Paths: -------------- MacRuby/branches/experimental/include/ruby/ruby.h MacRuby/branches/experimental/proc.c MacRuby/branches/experimental/roxor.cpp MacRuby/branches/experimental/roxor.h MacRuby/branches/experimental/test_roxor.rb MacRuby/branches/experimental/vm_eval.c Modified: MacRuby/branches/experimental/include/ruby/ruby.h =================================================================== --- MacRuby/branches/experimental/include/ruby/ruby.h 2009-03-22 01:17:49 UTC (rev 1054) +++ MacRuby/branches/experimental/include/ruby/ruby.h 2009-03-22 02:28:17 UTC (rev 1055) @@ -962,8 +962,8 @@ void rb_need_block(void); VALUE rb_iterate(VALUE(*)(VALUE),VALUE,VALUE(*)(ANYARGS),VALUE); VALUE rb_block_call(VALUE,ID,int,VALUE*,VALUE(*)(ANYARGS),VALUE); -VALUE rb_objc_block_call(VALUE obj, SEL sel, int argc, VALUE *argv, - VALUE (*bl_proc) (ANYARGS), VALUE data2); +VALUE rb_objc_block_call(VALUE obj, SEL sel, void *cache, int argc, + VALUE *argv, VALUE (*bl_proc) (ANYARGS), VALUE data2); VALUE rb_rescue(VALUE(*)(ANYARGS),VALUE,VALUE(*)(ANYARGS),VALUE); VALUE rb_rescue2(VALUE(*)(ANYARGS),VALUE,VALUE(*)(ANYARGS),VALUE,...); VALUE rb_ensure(VALUE(*)(ANYARGS),VALUE,VALUE(*)(ANYARGS),VALUE); Modified: MacRuby/branches/experimental/proc.c =================================================================== --- MacRuby/branches/experimental/proc.c 2009-03-22 01:17:49 UTC (rev 1054) +++ MacRuby/branches/experimental/proc.c 2009-03-22 02:28:17 UTC (rev 1055) @@ -1119,7 +1119,7 @@ } } - VALUE result = rb_vm_call_with_cache2(data->cache, data->recv, + VALUE result = rb_vm_call_with_cache2(data->cache, data->recv, data->oclass, data->sel, argc, argv); if (safe >= 0) { Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-22 01:17:49 UTC (rev 1054) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-22 02:28:17 UTC (rev 1055) @@ -383,7 +383,6 @@ std::map<ID, struct ccache *> ccache; std::map<Class, std::map<ID, int> *> ivar_slots; std::map<SEL, GlobalVariable *> redefined_ops_gvars; - std::stack<rb_vm_block_t *> current_blocks; public: static RoxorVM *current; @@ -399,14 +398,11 @@ std::map<NODE *, rb_vm_block_t *> blocks; std::map<double, struct rb_float_cache *> float_cache; unsigned char method_missing_reason; + rb_vm_block_t *current_block; + rb_vm_block_t *previous_block; // only used for non-Ruby created blocks RoxorVM(void); - rb_vm_block_t *top_block(void) { return current_blocks.top(); } - bool block_given(void) { return !current_blocks.empty(); } - void push_block(rb_vm_block_t *b) { current_blocks.push(b); } - void pop_block(void) { current_blocks.pop(); } - ExecutionEngine *execution_engine(void) { return ee; } IMP compile(Function *func, bool optimize=true) { @@ -1776,6 +1772,9 @@ backref = Qnil; broken_with = Qundef; + current_block = NULL; + previous_block = NULL; + load_path = rb_ary_new(); rb_objc_retain((void *)load_path); loaded_features = rb_ary_new(); @@ -4744,10 +4743,11 @@ if (block != NULL) { rb_vm_block_t *b = (rb_vm_block_t *)block; - GET_VM()->push_block(b); + rb_vm_block_t *old_b = GET_VM()->current_block; + GET_VM()->current_block = b; VALUE retval = __rb_vm_dispatch(cache, self, NULL, sel, opt, argc, argv); - GET_VM()->pop_block(); + GET_VM()->current_block = old_b; return retval; } @@ -4947,8 +4947,8 @@ extern "C" VALUE -rb_vm_call_with_cache2(void *cache, VALUE self, VALUE klass, SEL sel, int argc, - const VALUE *argv) +rb_vm_call_with_cache2(void *cache, VALUE self, VALUE klass, SEL sel, + int argc, const VALUE *argv) { return __rb_vm_dispatch((struct mcache *)cache, self, (Class)klass, sel, 0, argc, argv); @@ -4965,28 +4965,30 @@ int rb_block_given_p(void) { - return GET_VM()->block_given() ? Qtrue : Qfalse; + return GET_VM()->current_block != NULL ? Qtrue : Qfalse; } extern "C" rb_vm_block_t * rb_vm_current_block(void) { - return GET_VM()->top_block(); + return GET_VM()->current_block; } extern "C" void -rb_vm_push_block(rb_vm_block_t *block) +rb_vm_change_current_block(rb_vm_block_t *block) { - GET_VM()->push_block(block); + GET_VM()->previous_block = GET_VM()->current_block; + GET_VM()->current_block = block; } extern "C" void -rb_vm_pop_block(void) +rb_vm_restore_current_block(void) { - GET_VM()->pop_block(); + GET_VM()->current_block = GET_VM()->previous_block; + GET_VM()->previous_block = NULL; } extern "C" VALUE rb_proc_alloc_with_block(VALUE klass, rb_vm_block_t *proc); @@ -4995,8 +4997,8 @@ VALUE rb_vm_current_block_object(void) { - if (GET_VM()->block_given()) { - return rb_proc_alloc_with_block(rb_cProc, GET_VM()->top_block()); + if (GET_VM()->current_block != NULL) { + return rb_proc_alloc_with_block(rb_cProc, GET_VM()->current_block); } return Qnil; } @@ -5158,11 +5160,15 @@ static inline VALUE rb_vm_yield0(int argc, const VALUE *argv) { - rb_vm_block_t *b = GET_VM()->top_block(); + rb_vm_block_t *b = GET_VM()->current_block; - GET_VM()->pop_block(); + if (b == NULL) { + rb_raise(rb_eLocalJumpError, "no block given"); + } + + GET_VM()->current_block = GET_VM()->previous_block; VALUE retval = rb_vm_block_eval0(b, argc, argv); - GET_VM()->push_block(b); + GET_VM()->current_block = b; return retval; } @@ -5178,9 +5184,9 @@ VALUE rb_vm_yield_under(VALUE klass, VALUE self, int argc, const VALUE *argv) { - rb_vm_block_t *b = GET_VM()->top_block(); + rb_vm_block_t *b = GET_VM()->current_block; - GET_VM()->pop_block(); + GET_VM()->current_block = NULL; VALUE old_self = b->self; b->self = self; @@ -5189,7 +5195,7 @@ VALUE retval = rb_vm_block_eval0(b, argc, argv); b->self = old_self; - GET_VM()->push_block(b); + GET_VM()->current_block = b; return retval; } Modified: MacRuby/branches/experimental/roxor.h =================================================================== --- MacRuby/branches/experimental/roxor.h 2009-03-22 01:17:49 UTC (rev 1054) +++ MacRuby/branches/experimental/roxor.h 2009-03-22 02:28:17 UTC (rev 1055) @@ -112,8 +112,8 @@ rb_vm_block_t *rb_vm_prepare_block(void *llvm_function, NODE *node, VALUE self, int dvars_size, ...); rb_vm_block_t *rb_vm_current_block(void); -void rb_vm_push_block(rb_vm_block_t *block); -void rb_vm_pop_block(void); +void rb_vm_change_current_block(rb_vm_block_t *block); +void rb_vm_restore_current_block(void); VALUE rb_vm_block_eval(rb_vm_block_t *block, int argc, const VALUE *argv); struct rb_float_cache { Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-03-22 01:17:49 UTC (rev 1054) +++ MacRuby/branches/experimental/test_roxor.rb 2009-03-22 02:28:17 UTC (rev 1055) @@ -847,10 +847,12 @@ foo { |a = 42, *rest| p [a, rest] } } - assert ":ok", "def foo; p :ok if block_given?; end; foo {}" - assert ":ok", "def foo; p :ok unless block_given?; end; foo" - assert ":ok", "def foo; p block_given?; end; def bar; foo; end; bar {}" + assert "true", "def foo; p block_given?; end; foo {}" + assert "false", "def foo; p block_given?; end; foo" + assert "true", "def foo; p block_given?; end; def bar; foo; end; bar {}" + assert ':ok', "def foo; yield; end; begin; foo; rescue LocalJumpError; p :ok; end" + assert ":ok", "def foo(&m); m.call; end; foo { p :ok }" assert ":ok", "def foo(&m); p :ok if m == nil; end; foo" Modified: MacRuby/branches/experimental/vm_eval.c =================================================================== --- MacRuby/branches/experimental/vm_eval.c 2009-03-22 01:17:49 UTC (rev 1054) +++ MacRuby/branches/experimental/vm_eval.c 2009-03-22 02:28:17 UTC (rev 1055) @@ -274,16 +274,17 @@ } VALUE -rb_objc_block_call(VALUE obj, SEL sel, int argc, VALUE *argv, +rb_objc_block_call(VALUE obj, SEL sel, void *cache, int argc, VALUE *argv, VALUE (*bl_proc) (ANYARGS), VALUE data2) { NODE *node = NEW_IFUNC(bl_proc, data2); rb_vm_block_t *b = rb_vm_prepare_block(NULL, node, obj, 0); - - rb_vm_push_block(b); - VALUE val = rb_vm_call(obj, sel, argc, argv, false); - rb_vm_pop_block(); - + rb_vm_change_current_block(b); + if (cache == NULL) { + cache = rb_vm_get_call_cache(sel); + } + VALUE val = rb_vm_call_with_cache2(cache, obj, 0, sel, argc, argv); + rb_vm_restore_current_block(); return val; } @@ -300,7 +301,7 @@ snprintf(buf, sizeof buf, "%s:", rb_id2name(mid)); sel = sel_registerName(buf); } - return rb_objc_block_call(obj, sel, argc, argv, bl_proc, data2); + return rb_objc_block_call(obj, sel, NULL, argc, argv, bl_proc, data2); } VALUE

1 0

[1054] MacRuby/branches/experimental
by source_changes＠macosforge.org 22 Mar '09

22 Mar '09

Revision: 1054 http://trac.macosforge.org/projects/ruby/changeset/1054 Author: eloy.de.enige(a)gmail.com Date: 2009-03-21 18:17:49 -0700 (Sat, 21 Mar 2009) Log Message: ----------- Added workaround for File#each_line in mspec. Modified Paths: -------------- MacRuby/branches/experimental/mspec/lib/mspec/runner/mspec.rb MacRuby/branches/experimental/rakelib/spec.rake Modified: MacRuby/branches/experimental/mspec/lib/mspec/runner/mspec.rb =================================================================== --- MacRuby/branches/experimental/mspec/lib/mspec/runner/mspec.rb 2009-03-22 01:02:44 UTC (rev 1053) +++ MacRuby/branches/experimental/mspec/lib/mspec/runner/mspec.rb 2009-03-22 01:17:49 UTC (rev 1054) @@ -265,13 +265,20 @@ tags = [] file = tags_file if File.exist? file - File.open(file, "r") do |f| - f.each_line do |line| - line.chomp! - next if line.empty? - tag = SpecTag.new line.chomp - tags << tag if keys.include? tag.tag - end + # TODO: roxor workaround, or should mspec just use File.read anyways? + # File.open(file, "r") do |f| + # f.each_line do |line| + # line.chomp! + # next if line.empty? + # tag = SpecTag.new line.chomp + # tags << tag if keys.include? tag.tag + # end + # end + File.read(file).each_line do |line| + line.chomp! + next if line.empty? + tag = SpecTag.new line.chomp + tags << tag if keys.include? tag.tag end end tags Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-22 01:02:44 UTC (rev 1053) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-22 01:17:49 UTC (rev 1054) @@ -13,7 +13,7 @@ desc "Run language examples" task :language do - sh "./mspec/bin/mspec ci -B ./spec/frozen/macruby.mspec ./spec/frozen/language" + sh "./mspec/bin/mspec ci -B ./spec/frozen/macruby.mspec spec/frozen/language/*_spec.rb" end namespace :workaround do

1 0