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

[1507] MacRuby/branches/experimental/test_vm/exception.rb
by source_changes＠macosforge.org 30 Apr '09

30 Apr '09

Revision: 1507 http://trac.macosforge.org/projects/ruby/changeset/1507 Author: vincent.isambart(a)gmail.com Date: 2009-04-30 16:06:00 -0700 (Thu, 30 Apr 2009) Log Message: ----------- added failing tests for ensure Modified Paths: -------------- MacRuby/branches/experimental/test_vm/exception.rb Modified: MacRuby/branches/experimental/test_vm/exception.rb =================================================================== --- MacRuby/branches/experimental/test_vm/exception.rb 2009-04-30 10:54:05 UTC (rev 1506) +++ MacRuby/branches/experimental/test_vm/exception.rb 2009-04-30 23:06:00 UTC (rev 1507) @@ -108,3 +108,28 @@ } assert ":ok", "1.times { x = foo rescue nil; }; p :ok" + +# the code inside an ensure is even executed +# if we leave the ensure block with a throw +assert ':ok', %{ + catch(:a) do + begin + throw :a + ensure + p :ok + end + end +} + +# the code inside an ensure is even executed +# if we leave the ensure block with a return +assert ':ok', %{ + def foo + begin + return + ensure + p :ok + end + end + foo +}

1 0

[1506] MacRuby/branches/experimental/test_vm/block.rb
by source_changes＠macosforge.org 30 Apr '09

30 Apr '09

Revision: 1506 http://trac.macosforge.org/projects/ruby/changeset/1506 Author: vincent.isambart(a)gmail.com Date: 2009-04-30 03:54:05 -0700 (Thu, 30 Apr 2009) Log Message: ----------- added failing tests Modified Paths: -------------- MacRuby/branches/experimental/test_vm/block.rb Modified: MacRuby/branches/experimental/test_vm/block.rb =================================================================== --- MacRuby/branches/experimental/test_vm/block.rb 2009-04-29 07:04:30 UTC (rev 1505) +++ MacRuby/branches/experimental/test_vm/block.rb 2009-04-30 10:54:05 UTC (rev 1506) @@ -307,5 +307,29 @@ p f.call } +assert ":ok", %{ + def f() + 2.times do + begin + yield + rescue + end + end + end + f { raise 'a' } + p :ok +} + +assert ":ok", %{ + def f() + 2.times do + catch(:a) do + yield + end + end + end + f { throw :a } + p :ok +} # Enumerator assert "[\"f\", \"o\", \"o\"]", "p 'foo'.chars.to_a"

1 0

[1505] MacRuby/branches/experimental/test_vm/block.rb
by source_changes＠macosforge.org 29 Apr '09

29 Apr '09

Revision: 1505 http://trac.macosforge.org/projects/ruby/changeset/1505 Author: vincent.isambart(a)gmail.com Date: 2009-04-29 00:04:30 -0700 (Wed, 29 Apr 2009) Log Message: ----------- added some crazy tests for returned procs Modified Paths: -------------- MacRuby/branches/experimental/test_vm/block.rb Modified: MacRuby/branches/experimental/test_vm/block.rb =================================================================== --- MacRuby/branches/experimental/test_vm/block.rb 2009-04-29 03:54:03 UTC (rev 1504) +++ MacRuby/branches/experimental/test_vm/block.rb 2009-04-29 07:04:30 UTC (rev 1505) @@ -228,5 +228,84 @@ p f.call } +assert "42", %{ + def f() + a = nil + b = false + x = 42 + while true + return a if b + b = true + a = proc { x } + end + end + p f.call +} + +assert "42", %{ + def f() + x = 42 + $a = proc { x } + raise 'w' + end + begin + f + rescue + p $a.call + end +} + +assert "42", %{ + def g() + raise 'w' + end + def f() + x = 42 + $a = proc { x } + g + end + begin + f + rescue + p $a.call + end +} + +assert "42", %{ + def f() + x = 42 + $a = proc { x } + throw :w + end + catch(:w) do + f + end + p $a.call +} + +assert "42", %{ + def g() + throw :w + end + def f() + x = 42 + $a = proc { x } + g() + end + catch(:w) do + f + end + p $a.call +} + +assert "42", %{ + def f() + x = 42 + a = proc { x } + 1.times { return a } + end + p f.call +} + # Enumerator assert "[\"f\", \"o\", \"o\"]", "p 'foo'.chars.to_a"

1 0

[1504] MacRuby/branches/experimental/roxor.cpp
by source_changes＠macosforge.org 29 Apr '09

29 Apr '09

Revision: 1504 http://trac.macosforge.org/projects/ruby/changeset/1504 Author: vincent.isambart(a)gmail.com Date: 2009-04-28 20:54:03 -0700 (Tue, 28 Apr 2009) Log Message: ----------- added an assert Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-04-29 01:11:35 UTC (rev 1503) +++ MacRuby/branches/experimental/roxor.cpp 2009-04-29 03:54:03 UTC (rev 1504) @@ -8005,6 +8005,7 @@ block_call: + assert(!(b->flags & VM_BLOCK_ACTIVE)); b->flags |= VM_BLOCK_ACTIVE; VALUE v = __rb_vm_bcall(b->self, (VALUE)b->dvars, b->imp, b->arity, argc, argv);

1 0

[1503] MacRuby/branches/experimental
by source_changes＠macosforge.org 29 Apr '09

29 Apr '09

Revision: 1503 http://trac.macosforge.org/projects/ruby/changeset/1503 Author: vincent.isambart(a)gmail.com Date: 2009-04-28 18:11:35 -0700 (Tue, 28 Apr 2009) Log Message: ----------- do not always use the cached version of a block object Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp MacRuby/branches/experimental/roxor.h Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-04-29 01:11:29 UTC (rev 1502) +++ MacRuby/branches/experimental/roxor.cpp 2009-04-29 01:11:35 UTC (rev 1503) @@ -7700,7 +7700,7 @@ rb_vm_block_t *b; bool cached = false; - if (iter == GET_VM()->blocks.end()) { + if ((iter == GET_VM()->blocks.end()) || (iter->second->flags & (VM_BLOCK_ACTIVE | VM_BLOCK_PROC))) { b = (rb_vm_block_t *)xmalloc(sizeof(rb_vm_block_t) + (sizeof(VALUE *) * dvars_size)); @@ -8005,23 +8005,11 @@ block_call: - // We need to preserve dynamic variable slots here because our block may - // call the parent method which may call the block again, and since dvars - // are currently implemented using alloca() we will painfully die if the - // previous slots are not restored. - VALUE *old_dvars[100]; - assert(b->dvars_size < 100); - for (int i = 0; i < b->dvars_size; i++) { - old_dvars[i] = b->dvars[i]; - } - + b->flags |= VM_BLOCK_ACTIVE; VALUE v = __rb_vm_bcall(b->self, (VALUE)b->dvars, b->imp, b->arity, argc, argv); + b->flags &= ~VM_BLOCK_ACTIVE; - for (int i = 0; i < b->dvars_size; i++) { - b->dvars[i] = old_dvars[i]; - } - return v; } Modified: MacRuby/branches/experimental/roxor.h =================================================================== --- MacRuby/branches/experimental/roxor.h 2009-04-29 01:11:29 UTC (rev 1502) +++ MacRuby/branches/experimental/roxor.h 2009-04-29 01:11:35 UTC (rev 1503) @@ -21,6 +21,7 @@ #define VM_BLOCK_PROC 0x0001 // block is a Proc object #define VM_BLOCK_LAMBDA 0x0002 // block is a lambda +#define VM_BLOCK_ACTIVE 0x0004 // block is active (being executed) typedef struct { VALUE self;

1 0

[1502] MacRuby/branches/experimental/test_vm/block.rb
by source_changes＠macosforge.org 29 Apr '09

29 Apr '09

Revision: 1502 http://trac.macosforge.org/projects/ruby/changeset/1502 Author: vincent.isambart(a)gmail.com Date: 2009-04-28 18:11:29 -0700 (Tue, 28 Apr 2009) Log Message: ----------- added a few block/proc tests Modified Paths: -------------- MacRuby/branches/experimental/test_vm/block.rb Modified: MacRuby/branches/experimental/test_vm/block.rb =================================================================== --- MacRuby/branches/experimental/test_vm/block.rb 2009-04-28 22:53:43 UTC (rev 1501) +++ MacRuby/branches/experimental/test_vm/block.rb 2009-04-29 01:11:29 UTC (rev 1502) @@ -180,5 +180,53 @@ f(1, true) } +assert "42", %{ + def f() + a = nil + 1.times do + x = 42 + a = proc { x } + end + a + end + p f.call +} + +assert "42", %{ + def f() + x = 42 + a = nil + 1.times do + a = proc { x } + end + a + end + p f.call +} + +assert "42", %{ + def f() + a = nil + b = proc do + x = 42 + a = proc { x } + end + b.call + end + p f.call +} + +assert "42", %{ + def f() + x = 42 + a = nil + b = proc do + a = proc { x } + end + b.call + end + p f.call +} + # Enumerator assert "[\"f\", \"o\", \"o\"]", "p 'foo'.chars.to_a"

1 0

[1501] MacRuby/branches/experimental
by source_changes＠macosforge.org 28 Apr '09

28 Apr '09

Revision: 1501 http://trac.macosforge.org/projects/ruby/changeset/1501 Author: lsansonetti(a)apple.com Date: 2009-04-28 15:53:43 -0700 (Tue, 28 Apr 2009) Log Message: ----------- when passing a Pointer object as '^', compare the encoding types and raise TypeError if necessary Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp MacRuby/branches/experimental/spec/macruby/objc_method_spec.rb Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-04-28 05:53:14 UTC (rev 1500) +++ MacRuby/branches/experimental/roxor.cpp 2009-04-28 22:53:43 UTC (rev 1501) @@ -273,6 +273,7 @@ Function *newOpaqueFunc; Function *getStructFieldsFunc; Function *getOpaqueDataFunc; + Function *getPointerPtrFunc; Function *checkArityFunc; Function *setStructFunc; Function *newRangeFunc; @@ -363,6 +364,7 @@ rb_vm_bs_boxed_t *bs_boxed); Value *compile_get_opaque_data(Value *val, rb_vm_bs_boxed_t *bs_boxed, Value *slot); + Value *compile_get_cptr(Value *val, const char *type, Value *slot); void compile_check_arity(Value *given, Value *requested); void compile_set_struct(Value *rcv, int field, Value *val); @@ -698,6 +700,7 @@ newOpaqueFunc = NULL; getStructFieldsFunc = NULL; getOpaqueDataFunc = NULL; + getPointerPtrFunc = NULL; checkArityFunc = NULL; setStructFunc = NULL; newRangeFunc = NULL; @@ -5070,24 +5073,19 @@ *ocval = (float)rval_to_double(rval); } -static void *rb_pointer_get_data(VALUE rcv); +static void *rb_pointer_get_data(VALUE rcv, const char *type); extern "C" -void -rb_vm_rval_to_cptr(VALUE rval, void **cptr) +void * +rb_vm_rval_to_cptr(VALUE rval, const char *type, void **cptr) { if (NIL_P(rval)) { *cptr = NULL; } else { - if (!rb_obj_is_kind_of(rval, rb_cPointer)) { - rb_raise(rb_eTypeError, - "expected instance of Pointer, got `%s' (%s)", - RSTRING_PTR(rb_inspect(rval)), - rb_obj_classname(rval)); - } - *cptr = rb_pointer_get_data(rval); + *cptr = rb_pointer_get_data(rval, type); } + return *cptr; } static inline long @@ -5229,11 +5227,27 @@ params.push_back(compile_const_pointer(bs_boxed)); params.push_back(slot); - return CallInst::Create(getOpaqueDataFunc, params.begin(), params.end(), - "", bb); + return compile_protected_call(getOpaqueDataFunc, params); } Value * +RoxorCompiler::compile_get_cptr(Value *val, const char *type, Value *slot) +{ + if (getPointerPtrFunc == NULL) { + getPointerPtrFunc = cast<Function>(module->getOrInsertFunction( + "rb_vm_rval_to_cptr", + PtrTy, RubyObjTy, PtrTy, PtrPtrTy, NULL)); + } + + std::vector<Value *> params; + params.push_back(val); + params.push_back(compile_const_pointer(sel_registerName(type))); + params.push_back(new BitCastInst(slot, PtrPtrTy, "", bb)); + + return compile_protected_call(getPointerPtrFunc, params); +} + +Value * RoxorCompiler::compile_conversion_to_c(const char *type, Value *val, Value *slot) { @@ -5357,7 +5371,7 @@ return compile_get_opaque_data(val, bs_boxed, slot); } - func_name = "rb_vm_rval_to_cptr"; + return compile_get_cptr(val, type, slot); } break; } @@ -9137,11 +9151,26 @@ } static void * -rb_pointer_get_data(VALUE rcv) +rb_pointer_get_data(VALUE rcv, const char *type) { + if (!rb_obj_is_kind_of(rcv, rb_cPointer)) { + rb_raise(rb_eTypeError, + "expected instance of Pointer, got `%s' (%s)", + RSTRING_PTR(rb_inspect(rcv)), + rb_obj_classname(rcv)); + } + rb_vm_pointer_t *ptr; Data_Get_Struct(rcv, rb_vm_pointer_t, ptr); + assert(*type == _C_PTR); + if (strcmp(RSTRING_PTR(ptr->type), type + 1) != 0) { + rb_raise(rb_eTypeError, + "expected instance of Pointer of type `%s', got `%s'", + RSTRING_PTR(ptr->type), + type + 1); + } + return ptr->val; } Modified: MacRuby/branches/experimental/spec/macruby/objc_method_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/macruby/objc_method_spec.rb 2009-04-28 05:53:14 UTC (rev 1500) +++ MacRuby/branches/experimental/spec/macruby/objc_method_spec.rb 2009-04-28 22:53:43 UTC (rev 1501) @@ -372,9 +372,12 @@ @o.methodAcceptingIntPtr(p).should == 1 p[0].should == 43 + lambda { @o.methodAcceptingIntPtr(Pointer.new(:uint)) }.should raise_error(TypeError) lambda { @o.methodAcceptingIntPtr(123) }.should raise_error(TypeError) @o.methodAcceptingIntPtr2(nil).should == 1 + + lambda { @o.methodAcceptingIntPtr2(Pointer.new(:uint)) }.should raise_error(TypeError) end it "accepting an 'id *' should be given a Pointer object and receive the pointer as expected" do @@ -383,9 +386,12 @@ @o.methodAcceptingObjectPtr(p).should == 1 p[0].should == NSObject + lambda { @o.methodAcceptingObjectPtr(Pointer.new(:int)) }.should raise_error(TypeError) lambda { @o.methodAcceptingObjectPtr(123) }.should raise_error(TypeError) @o.methodAcceptingObjectPtr2(nil).should == 1 + + lambda { @o.methodAcceptingObjectPtr2(Pointer.new(:int)) }.should raise_error(TypeError) end it "accepting an 'NSRect *' should be given a Pointer object and receive the pointer as expected" do @@ -397,8 +403,11 @@ p[0].size.width.should == 44 p[0].size.height.should == 45 + lambda { @o.methodAcceptingNSRectPtr(Pointer.new(NSPoint.type)) }.should raise_error(TypeError) lambda { @o.methodAcceptingNSRectPtr(123) }.should raise_error(TypeError) @o.methodAcceptingNSRectPtr2(nil).should == 1 + + lambda { @o.methodAcceptingNSRectPtr2(Pointer.new(NSPoint.type)) }.should raise_error(TypeError) end end

1 0

[1500] MacRuby/branches/experimental/spec/macruby
by source_changes＠macosforge.org 28 Apr '09

28 Apr '09

Revision: 1500 http://trac.macosforge.org/projects/ruby/changeset/1500 Author: lsansonetti(a)apple.com Date: 2009-04-27 22:53:14 -0700 (Mon, 27 Apr 2009) Log Message: ----------- added specs for BS constants Modified Paths: -------------- MacRuby/branches/experimental/spec/macruby/objc_method_spec.rb Added Paths: ----------- MacRuby/branches/experimental/spec/macruby/constant_spec.rb MacRuby/branches/experimental/spec/macruby/fixtures/constant.bridgesupport MacRuby/branches/experimental/spec/macruby/fixtures/constant.m Added: MacRuby/branches/experimental/spec/macruby/constant_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/macruby/constant_spec.rb (rev 0) +++ MacRuby/branches/experimental/spec/macruby/constant_spec.rb 2009-04-28 05:53:14 UTC (rev 1500) @@ -0,0 +1,92 @@ +require File.dirname(__FILE__) + '/../spec_helper' + +framework 'Foundation' + +fixture_source = File.dirname(__FILE__) + '/fixtures/constant.m' +fixture_ext = '/tmp/constant.bundle' +if !File.exist?(fixture_ext) or File.mtime(fixture_source) > File.mtime(fixture_ext) + `/usr/bin/gcc #{fixture_source} -o #{fixture_ext} -g -framework Foundation -dynamiclib -fobjc-gc -arch i386 -arch x86_64 -arch ppc` +end +require '/tmp/constant' +load_bridge_support_file File.dirname(__FILE__) + '/fixtures/constant.bridgesupport' + +describe "A BridgeSupport constant" do + it "of type 'id' is available as an Object in Ruby" do + ConstantObject.class.should == NSString + ConstantObject.should == 'foo' + end + + it "of type 'Class' is available as a Class in Ruby" do + ConstantClass.class.should == Class + ConstantClass.should == NSObject + end + + it "of type 'SEL' is available as a Symbol in Ruby" do + ConstantSEL.class.should == Symbol + ConstantSEL.should == :'foo:with:with:' + end + + it "of type 'char' or 'unsigned char' is available as a Fixnum in Ruby" do + ConstantChar.class.should == Fixnum + ConstantUnsignedChar.class.should == Fixnum + ConstantChar.should == 42 + ConstantUnsignedChar.should == 42 + end + + it "of type 'short' or 'unsigned short' is available as a Fixnum in Ruby" do + ConstantShort.class.should == Fixnum + ConstantUnsignedShort.class.should == Fixnum + ConstantShort.should == 42 + ConstantUnsignedShort.should == 42 + end + + it "of type 'int' or 'unsigned int' is available as a Fixnum in Ruby" do + ConstantInt.class.should == Fixnum + ConstantUnsignedInt.class.should == Fixnum + ConstantInt.should == 42 + ConstantUnsignedInt.should == 42 + end + + it "of type 'long' or 'unsigned long' is available as a Fixnum in Ruby" do + ConstantLong.class.should == Fixnum + ConstantUnsignedLong.class.should == Fixnum + ConstantLong.should == 42 + ConstantUnsignedLong.should == 42 + end + + it "of type 'long long' or 'unsigned long long' is available as a Fixnum in Ruby" do + ConstantLongLong.class.should == Fixnum + ConstantUnsignedLongLong.class.should == Fixnum + ConstantLongLong.should == 42 + ConstantUnsignedLongLong.should == 42 + end + + it "of type 'float' or 'double' is available as a Float in Ruby" do + ConstantFloat.class.should == Float + ConstantDouble.class.should == Float + ConstantFloat.should.be_close(3.1415, 0.0001) + ConstantDouble.should.be_close(3.1415, 0.0001) + end + + it "of type 'BOOL' is available as true/false in Ruby" do + ConstantYES.class.should == TrueClass + ConstantNO.class.should == FalseClass + ConstantYES.should == true + ConstantNO.should == false + end + + it "of type 'NSPoint' is available as an NSPoint boxed instance in Ruby" do + ConstantNSPoint.class.should == NSPoint + ConstantNSPoint.should == NSPoint.new(1, 2) + end + + it "of type 'NSSize' is available as an NSSize boxed instance in Ruby" do + ConstantNSSize.class.should == NSSize + ConstantNSSize.should == NSSize.new(3, 4) + end + + it "of type 'NSRect' is available as an NSRect boxed instance in Ruby" do + ConstantNSRect.class.should == NSRect + ConstantNSRect.should == NSRect.new(NSPoint.new(1, 2), NSSize.new(3, 4)) + end +end Added: MacRuby/branches/experimental/spec/macruby/fixtures/constant.bridgesupport =================================================================== --- MacRuby/branches/experimental/spec/macruby/fixtures/constant.bridgesupport (rev 0) +++ MacRuby/branches/experimental/spec/macruby/fixtures/constant.bridgesupport 2009-04-28 05:53:14 UTC (rev 1500) @@ -0,0 +1,24 @@ +<?xml version='1.0'?> +<!DOCTYPE signatures SYSTEM "file://localhost/System/Library/DTDs/BridgeSupport.dtd"> +<signatures version='0.9'> + <constant name='ConstantChar' type='c'/> + <constant name='ConstantClass' type='#'/> + <constant name='ConstantDouble' type='d'/> + <constant name='ConstantFloat' type='f'/> + <constant name='ConstantInt' type='i'/> + <constant name='ConstantLong' type='l'/> + <constant name='ConstantLongLong' type='q'/> + <constant name='ConstantNO' type='B'/> + <constant name='ConstantNSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/> + <constant name='ConstantNSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/> + <constant name='ConstantNSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/> + <constant name='ConstantObject' type='@'/> + <constant name='ConstantSEL' type=':'/> + <constant name='ConstantShort' type='s'/> + <constant name='ConstantUnsignedChar' type='C'/> + <constant name='ConstantUnsignedInt' type='I'/> + <constant name='ConstantUnsignedLong' type='L'/> + <constant name='ConstantUnsignedLongLong' type='Q'/> + <constant name='ConstantUnsignedShort' type='S'/> + <constant name='ConstantYES' type='B'/> +</signatures> Added: MacRuby/branches/experimental/spec/macruby/fixtures/constant.m =================================================================== --- MacRuby/branches/experimental/spec/macruby/fixtures/constant.m (rev 0) +++ MacRuby/branches/experimental/spec/macruby/fixtures/constant.m 2009-04-28 05:53:14 UTC (rev 1500) @@ -0,0 +1,47 @@ +#import <Foundation/Foundation.h> + +id ConstantObject; +Class ConstantClass; +SEL ConstantSEL; +char ConstantChar; +unsigned char ConstantUnsignedChar; +short ConstantShort; +unsigned short ConstantUnsignedShort; +int ConstantInt; +unsigned int ConstantUnsignedInt; +long ConstantLong; +unsigned long ConstantUnsignedLong; +long long ConstantLongLong; +unsigned long long ConstantUnsignedLongLong; +float ConstantFloat; +double ConstantDouble; +BOOL ConstantYES; +BOOL ConstantNO; +NSPoint ConstantNSPoint; +NSSize ConstantNSSize; +NSRect ConstantNSRect; + +void +Init_constant(void) +{ + ConstantObject = @"foo"; + ConstantClass = [NSObject class]; + ConstantSEL = @selector(foo:with:with:); + ConstantChar = 42; + ConstantUnsignedChar = 42; + ConstantShort = 42; + ConstantUnsignedShort = 42; + ConstantInt = 42; + ConstantUnsignedInt = 42; + ConstantLong = 42; + ConstantUnsignedLong = 42; + ConstantLongLong = 42; + ConstantUnsignedLongLong = 42; + ConstantFloat = 3.1415; + ConstantDouble = 3.1415; + ConstantYES = YES; + ConstantNO = NO; + ConstantNSPoint = NSMakePoint(1, 2); + ConstantNSSize = NSMakeSize(3, 4); + ConstantNSRect = NSMakeRect(1, 2, 3, 4); +} Modified: MacRuby/branches/experimental/spec/macruby/objc_method_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/macruby/objc_method_spec.rb 2009-04-28 05:13:10 UTC (rev 1499) +++ MacRuby/branches/experimental/spec/macruby/objc_method_spec.rb 2009-04-28 05:53:14 UTC (rev 1500) @@ -5,13 +5,6 @@ fixture_source = File.dirname(__FILE__) + '/fixtures/method.m' fixture_ext = '/tmp/method.bundle' if !File.exist?(fixture_ext) or File.mtime(fixture_source) > File.mtime(fixture_ext) -=begin - # #system is currently broken - unless system("/usr/bin/gcc #{fixture_source} -o #{fixture_ext} -g -framework Foundation -dynamiclib -fobjc-gc -arch i386 -arch x86_64 -arch ppc") - $stderr.puts "cannot compile fixture source file `#{fixture_source}' - aborting" - exit 1 - end -=end `/usr/bin/gcc #{fixture_source} -o #{fixture_ext} -g -framework Foundation -dynamiclib -fobjc-gc -arch i386 -arch x86_64 -arch ppc` end require '/tmp/method'

1 0

[1499] MacRuby/branches/experimental
by source_changes＠macosforge.org 28 Apr '09

28 Apr '09

Revision: 1499 http://trac.macosforge.org/projects/ruby/changeset/1499 Author: lsansonetti(a)apple.com Date: 2009-04-27 22:13:10 -0700 (Mon, 27 Apr 2009) Log Message: ----------- guess what, more Pointer work Modified Paths: -------------- MacRuby/branches/experimental/include/ruby/ruby.h MacRuby/branches/experimental/objc.m MacRuby/branches/experimental/roxor.cpp MacRuby/branches/experimental/spec/macruby/fixtures/method.m MacRuby/branches/experimental/spec/macruby/objc_method_spec.rb Modified: MacRuby/branches/experimental/include/ruby/ruby.h =================================================================== --- MacRuby/branches/experimental/include/ruby/ruby.h 2009-04-28 04:39:25 UTC (rev 1498) +++ MacRuby/branches/experimental/include/ruby/ruby.h 2009-04-28 05:13:10 UTC (rev 1499) @@ -1065,6 +1065,7 @@ RUBY_EXTERN VALUE rb_cNSMutableSet; RUBY_EXTERN VALUE rb_cCFNumber; RUBY_EXTERN VALUE rb_cBoxed; +RUBY_EXTERN VALUE rb_cPointer; bool _CFArrayIsMutable(void *); #define RARRAY_IMMUTABLE(o) (*(VALUE *)o == rb_cCFArray && !_CFArrayIsMutable((void *)o)) Modified: MacRuby/branches/experimental/objc.m =================================================================== --- MacRuby/branches/experimental/objc.m 2009-04-28 04:39:25 UTC (rev 1498) +++ MacRuby/branches/experimental/objc.m 2009-04-28 05:13:10 UTC (rev 1499) @@ -75,7 +75,7 @@ static struct st_table *bs_inf_prot_imethods; static struct st_table *bs_cftypes; -static VALUE rb_cPointer; +//static VALUE rb_cPointer; struct RPointer { @@ -503,6 +503,7 @@ return n; } +#if 0 static VALUE rb_pointer_create(void *ptr, const char *type) { @@ -514,6 +515,7 @@ return Data_Wrap_Struct(rb_cPointer, NULL, NULL, data); } +#endif static void rb_objc_rval_to_ocval(VALUE, const char *, void **); @@ -720,12 +722,14 @@ if (SPECIAL_CONST_P(rval)) { ok = false; } +#if 0 else if (*(VALUE *)rval == rb_cPointer) { struct RPointer *data; Data_Get_Struct(rval, struct RPointer, data); *(void **)ocval = data->ptr; } +#endif else if (strcmp(octype, "^v") == 0) { *(void **)ocval = (void *)rval; } @@ -972,7 +976,7 @@ *rbval = Qnil; } else { - *rbval = rb_pointer_create(*(void **)ocval, octype + 1); + //*rbval = rb_pointer_create(*(void **)ocval, octype + 1); } break; Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-04-28 04:39:25 UTC (rev 1498) +++ MacRuby/branches/experimental/roxor.cpp 2009-04-28 05:13:10 UTC (rev 1499) @@ -5070,6 +5070,26 @@ *ocval = (float)rval_to_double(rval); } +static void *rb_pointer_get_data(VALUE rcv); + +extern "C" +void +rb_vm_rval_to_cptr(VALUE rval, void **cptr) +{ + if (NIL_P(rval)) { + *cptr = NULL; + } + else { + if (!rb_obj_is_kind_of(rval, rb_cPointer)) { + rb_raise(rb_eTypeError, + "expected instance of Pointer, got `%s' (%s)", + RSTRING_PTR(rb_inspect(rval)), + rb_obj_classname(rval)); + } + *cptr = rb_pointer_get_data(rval); + } +} + static inline long rebuild_new_struct_ary(const StructType *type, VALUE orig, VALUE new_ary) { @@ -5336,13 +5356,14 @@ if (bs_boxed != NULL) { return compile_get_opaque_data(val, bs_boxed, slot); } + + func_name = "rb_vm_rval_to_cptr"; } break; } if (func_name == NULL) { - printf("unrecognized compile type `%s' to C - aborting\n", type); - abort(); + rb_raise(rb_eTypeError, "unrecognized compile type `%s' to C", type); } std::vector<Value *> params; @@ -5579,7 +5600,7 @@ } if (func_name == NULL) { - printf("unrecognized compile type `%s' to Ruby - aborting\n", type); + rb_raise(rb_eTypeError, "unrecognized compile type `%s' to Ruby", type); abort(); } @@ -5660,7 +5681,7 @@ break; } - rb_raise(rb_eTypeError, "unrecognized runtime type `%s'\n", type); + rb_raise(rb_eTypeError, "unrecognized runtime type `%s'", type); } Function * @@ -9115,6 +9136,15 @@ return Data_Wrap_Struct(rb_cPointer, NULL, NULL, ptr); } +static void * +rb_pointer_get_data(VALUE rcv) +{ + rb_vm_pointer_t *ptr; + Data_Get_Struct(rcv, rb_vm_pointer_t, ptr); + + return ptr->val; +} + #define POINTER_VAL(ptr, idx) \ (void *)((char *)ptr->val + (FIX2INT(idx) * ptr->type_size)) @@ -9258,14 +9288,14 @@ RoxorVM::find_bs_struct(std::string type) { rb_vm_bs_boxed_t *boxed = find_bs_boxed(type); - return boxed->is_struct() ? boxed : NULL; + return boxed == NULL ? NULL : boxed->is_struct() ? boxed : NULL; } inline rb_vm_bs_boxed_t * RoxorVM::find_bs_opaque(std::string type) { rb_vm_bs_boxed_t *boxed = find_bs_boxed(type); - return boxed->is_struct() ? NULL : boxed; + return boxed == NULL ? NULL : boxed->is_struct() ? NULL : boxed; } static inline void Modified: MacRuby/branches/experimental/spec/macruby/fixtures/method.m =================================================================== --- MacRuby/branches/experimental/spec/macruby/fixtures/method.m 2009-04-28 04:39:25 UTC (rev 1498) +++ MacRuby/branches/experimental/spec/macruby/fixtures/method.m 2009-04-28 05:13:10 UTC (rev 1499) @@ -345,6 +345,43 @@ && a7 == 42; } +- (BOOL)methodAcceptingIntPtr:(int *)ptr +{ + BOOL ok = ptr[0] == 42; + ptr[0] = 43; + return ok; +} + +- (BOOL)methodAcceptingIntPtr2:(int *)ptr +{ + return ptr == NULL; +} + +- (BOOL)methodAcceptingObjectPtr:(id *)ptr +{ + BOOL ok = ptr[0] == self; + ptr[0] = (id)[NSObject class]; + return ok; +} + +- (BOOL)methodAcceptingObjectPtr2:(id *)ptr +{ + return ptr == NULL; +} + +- (BOOL)methodAcceptingNSRectPtr:(NSRect *)ptr +{ + BOOL ok = ptr->origin.x == 1 && ptr->origin.y == 2 + && ptr->size.width == 3 && ptr->size.height == 4; + *ptr = NSMakeRect(42, 43, 44, 45); + return ok; +} + +- (BOOL)methodAcceptingNSRectPtr2:(NSRect *)ptr +{ + return ptr == NULL; +} + @end void Modified: MacRuby/branches/experimental/spec/macruby/objc_method_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/macruby/objc_method_spec.rb 2009-04-28 04:39:25 UTC (rev 1498) +++ MacRuby/branches/experimental/spec/macruby/objc_method_spec.rb 2009-04-28 05:13:10 UTC (rev 1499) @@ -372,4 +372,40 @@ @o.methodAcceptingInt(42, float:42, double:42, short:42, NSPoint:[42, 42], NSRect:[42, 42, 42, 42], char:42).should == 1 end + + it "accepting an 'int *' should be given a Pointer object and receive the pointer as expected" do + p = Pointer.new(:int) + p[0] = 42 + @o.methodAcceptingIntPtr(p).should == 1 + p[0].should == 43 + + lambda { @o.methodAcceptingIntPtr(123) }.should raise_error(TypeError) + + @o.methodAcceptingIntPtr2(nil).should == 1 + end + + it "accepting an 'id *' should be given a Pointer object and receive the pointer as expected" do + p = Pointer.new(:object) + p[0] = @o + @o.methodAcceptingObjectPtr(p).should == 1 + p[0].should == NSObject + + lambda { @o.methodAcceptingObjectPtr(123) }.should raise_error(TypeError) + + @o.methodAcceptingObjectPtr2(nil).should == 1 + end + + it "accepting an 'NSRect *' should be given a Pointer object and receive the pointer as expected" do + p = Pointer.new(NSRect.type) + p[0] = [1, 2, 3, 4] + @o.methodAcceptingNSRectPtr(p).should == 1 + p[0].origin.x.should == 42 + p[0].origin.y.should == 43 + p[0].size.width.should == 44 + p[0].size.height.should == 45 + + lambda { @o.methodAcceptingNSRectPtr(123) }.should raise_error(TypeError) + + @o.methodAcceptingNSRectPtr2(nil).should == 1 + end end

1 0

[1498] MacRuby/branches/experimental
by source_changes＠macosforge.org 28 Apr '09

28 Apr '09

Revision: 1498 http://trac.macosforge.org/projects/ruby/changeset/1498 Author: lsansonetti(a)apple.com Date: 2009-04-27 21:39:25 -0700 (Mon, 27 Apr 2009) Log Message: ----------- rewrote the setFoo/foo= and isFoo/foo? specs to use a class in method.m + fixed a bug in the isFoo/foo? helper Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp MacRuby/branches/experimental/spec/macruby/fixtures/method.bridgesupport MacRuby/branches/experimental/spec/macruby/fixtures/method.m MacRuby/branches/experimental/spec/macruby/objc_method_spec.rb Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-04-28 04:25:21 UTC (rev 1497) +++ MacRuby/branches/experimental/roxor.cpp 2009-04-28 04:39:25 UTC (rev 1498) @@ -7207,10 +7207,12 @@ helper_sel(SEL sel) { const char *p = sel_getName(sel); - long len = strlen(p); + size_t len = strlen(p); SEL new_sel = 0; char buf[100]; + assert(len < sizeof(buf)); + if (len >= 3 && isalpha(p[len - 3]) && p[len - 2] == '=' && p[len - 1] == ':') { /* foo=: -> setFoo: shortcut */ snprintf(buf, sizeof buf, "set%s", p); @@ -7219,7 +7221,7 @@ buf[len + 2] = '\0'; new_sel = sel_registerName(buf); } - else if (isalpha(p[len - 2]) && p[len - 1] == '?') { + else if (len > 1 && p[len - 1] == '?') { /* foo?: -> isFoo: shortcut */ snprintf(buf, sizeof buf, "is%s", p); buf[2] = toupper(buf[2]); Modified: MacRuby/branches/experimental/spec/macruby/fixtures/method.bridgesupport =================================================================== --- MacRuby/branches/experimental/spec/macruby/fixtures/method.bridgesupport 2009-04-28 04:25:21 UTC (rev 1497) +++ MacRuby/branches/experimental/spec/macruby/fixtures/method.bridgesupport 2009-04-28 04:39:25 UTC (rev 1498) @@ -2,6 +2,12 @@ <!DOCTYPE signatures SYSTEM "file://localhost/System/Library/DTDs/BridgeSupport.dtd"> <signatures version='0.9'> <class name='TestMethod'> + <method selector='isFoo'> + <retval type='B'/> + </method> + <method selector='isFoo2'> + <retval type='B'/> + </method> <method selector='methodReturningYES'> <retval type='B'/> </method> Modified: MacRuby/branches/experimental/spec/macruby/fixtures/method.m =================================================================== --- MacRuby/branches/experimental/spec/macruby/fixtures/method.m 2009-04-28 04:25:21 UTC (rev 1497) +++ MacRuby/branches/experimental/spec/macruby/fixtures/method.m 2009-04-28 04:39:25 UTC (rev 1498) @@ -1,10 +1,33 @@ #import <Foundation/Foundation.h> @interface TestMethod : NSObject +{ + id _foo; +} @end @implementation TestMethod +- (BOOL)isFoo +{ + return YES; +} + +- (BOOL)isFoo2 +{ + return NO; +} + +- (void)setFoo:(id)foo +{ + _foo = foo; +} + +- (id)foo +{ + return _foo; +} + - (void)methodReturningVoid { } Modified: MacRuby/branches/experimental/spec/macruby/objc_method_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/macruby/objc_method_spec.rb 2009-04-28 04:25:21 UTC (rev 1497) +++ MacRuby/branches/experimental/spec/macruby/objc_method_spec.rb 2009-04-28 04:39:25 UTC (rev 1498) @@ -23,23 +23,26 @@ end it "can be called with #foo= if it matches the #setFoo pattern" do - o = [] + # Note: we cannot use #have_method here because pure Objective-C + # methods as well as convenience shortcuts are not exposed in #methods. + @o.respond_to?(:'setFoo').should == true + @o.respond_to?(:'foo=').should == true + @o.respond_to?(:'foo').should == true - # TODO Stopped here: This should be sufficient, but doesn't work. - # o.should have_method(:'setArray', true) - # o.should have_method(:'array=', true) - - o.respond_to?(:'setArray').should == true - o.respond_to?(:'array=').should == true - o.array = [1, 2, 3] - o.should == [1, 2, 3] + @o.setFoo(123) + @o.foo.should == 123 + @o.foo = 456 + @o.foo.should == 456 end it "can be called with #foo? if it matches the #isFoo pattern" do - o = NSBundle.mainBundle - o.respond_to?(:'isLoaded').should == true - o.respond_to?(:'loaded?').should == true - o.loaded?.should == true + @o.respond_to?(:'isFoo').should == true + @o.respond_to?(:'foo?').should == true + @o.foo?.should == true + + @o.respond_to?(:'isFoo2').should == true + @o.respond_to?(:'foo2?').should == true + @o.foo2?.should == false end it "is only exposed in #methods if the second argument is true" do

1 0