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

[3180] MacRuby/trunk/lib/rubygems
by source_changes＠macosforge.org 31 Dec '09

31 Dec '09

Revision: 3180 http://trac.macosforge.org/projects/ruby/changeset/3180 Author: eloy.de.enige(a)gmail.com Date: 2009-12-31 03:11:44 -0800 (Thu, 31 Dec 2009) Log Message: ----------- Make RubyGems use ?\226?\128?\152--format-executable?\226?\128?\153 by default, so binaries get installed with the ?\226?\128?\152mac?\226?\128?\153 prefix. For now just hacked it in, need to check upstream why this isn't the default. Modified Paths: -------------- MacRuby/trunk/lib/rubygems/commands/install_command.rb MacRuby/trunk/lib/rubygems/dependency_installer.rb MacRuby/trunk/lib/rubygems/installer.rb Modified: MacRuby/trunk/lib/rubygems/commands/install_command.rb =================================================================== --- MacRuby/trunk/lib/rubygems/commands/install_command.rb 2009-12-31 06:36:08 UTC (rev 3179) +++ MacRuby/trunk/lib/rubygems/commands/install_command.rb 2009-12-31 11:11:44 UTC (rev 3180) @@ -16,7 +16,7 @@ defaults = Gem::DependencyInstaller::DEFAULT_OPTIONS.merge({ :generate_rdoc => false, :generate_ri => false, - :format_executable => false, + :format_executable => true, # MacRuby addition :test => false, :version => Gem::Requirement.default, }) Modified: MacRuby/trunk/lib/rubygems/dependency_installer.rb =================================================================== --- MacRuby/trunk/lib/rubygems/dependency_installer.rb 2009-12-31 06:36:08 UTC (rev 3179) +++ MacRuby/trunk/lib/rubygems/dependency_installer.rb 2009-12-31 11:11:44 UTC (rev 3180) @@ -18,7 +18,7 @@ :env_shebang => false, :domain => :both, # HACK dup :force => false, - :format_executable => false, # HACK dup + :format_executable => true, # MacRuby addition :ignore_dependencies => false, :security_policy => nil, # HACK NoSecurity requires OpenSSL. AlmostNo? Low? :wrappers => true Modified: MacRuby/trunk/lib/rubygems/installer.rb =================================================================== --- MacRuby/trunk/lib/rubygems/installer.rb 2009-12-31 06:36:08 UTC (rev 3179) +++ MacRuby/trunk/lib/rubygems/installer.rb 2009-12-31 11:11:44 UTC (rev 3180) @@ -90,12 +90,13 @@ @gem = gem options = { - :bin_dir => nil, - :env_shebang => false, - :exec_format => false, - :force => false, - :install_dir => Gem.dir, - :source_index => Gem.source_index, + :bin_dir => nil, + :env_shebang => false, + :exec_format => false, + :force => false, + :format_executable => true, # MacRuby addition + :install_dir => Gem.dir, + :source_index => Gem.source_index, }.merge options @env_shebang = options[:env_shebang]

1 0

[3179] MacRuby/trunk/rakelib/builder.rake
by source_changes＠macosforge.org 31 Dec '09

31 Dec '09

Revision: 3179 http://trac.macosforge.org/projects/ruby/changeset/3179 Author: vincent.isambart(a)gmail.com Date: 2009-12-30 22:36:08 -0800 (Wed, 30 Dec 2009) Log Message: ----------- C extensions should be compiled with exceptions support. Please do a "rm rbconfig.rbo; rake ext:clean" before rebuilding Modified Paths: -------------- MacRuby/trunk/rakelib/builder.rake Modified: MacRuby/trunk/rakelib/builder.rake =================================================================== --- MacRuby/trunk/rakelib/builder.rake 2009-12-31 05:29:46 UTC (rev 3178) +++ MacRuby/trunk/rakelib/builder.rake 2009-12-31 06:36:08 UTC (rev 3179) @@ -154,7 +154,7 @@ CONFIG["target_vendor"] = "apple" CONFIG["target_os"] = "darwin9.0" CONFIG["CC"] = "/usr/bin/gcc" - CONFIG["CFLAGS"] = "-fno-common -pipe $(cflags)" + CONFIG["CFLAGS"] = "-fexceptions -fno-common -pipe $(cflags)" CONFIG["LDFLAGS"] = "" CONFIG["CPPFLAGS"] = "$(cppflags)" CONFIG["OBJEXT"] = "o"

1 0

[3178] MacRuby/trunk/vm.cpp
by source_changes＠macosforge.org 31 Dec '09

31 Dec '09

Revision: 3178 http://trac.macosforge.org/projects/ruby/changeset/3178 Author: lsansonetti(a)apple.com Date: 2009-12-30 21:29:46 -0800 (Wed, 30 Dec 2009) Log Message: ----------- fixed a thread-safety bug in RoxorCore::retype_method() Modified Paths: -------------- MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2009-12-29 03:10:07 UTC (rev 3177) +++ MacRuby/trunk/vm.cpp 2009-12-31 05:29:46 UTC (rev 3178) @@ -1778,6 +1778,8 @@ RoxorCore::retype_method(Class klass, rb_vm_method_node_t *node, const char *types) { + lock(); + // TODO: 1) don't reinstall method in case the types didn't change // 2) free LLVM machine code from old objc IMP @@ -1788,8 +1790,12 @@ objc_to_ruby_stubs[node->ruby_imp] = node->objc_imp; // Re-add the method. - return add_method(klass, node->sel, node->objc_imp, node->ruby_imp, + node = add_method(klass, node->sel, node->objc_imp, node->ruby_imp, node->arity, node->flags, types); + + unlock(); + + return node; } rb_vm_method_node_t *

1 0

[3177] MacRuby/trunk
by source_changes＠macosforge.org 29 Dec '09

29 Dec '09

Revision: 3177 http://trac.macosforge.org/projects/ruby/changeset/3177 Author: vincent.isambart(a)gmail.com Date: 2009-12-28 19:10:07 -0800 (Mon, 28 Dec 2009) Log Message: ----------- fixed build on Mac OS X 10.6.2 Modified Paths: -------------- MacRuby/trunk/array.c MacRuby/trunk/hash.c MacRuby/trunk/numeric.c MacRuby/trunk/string.c Modified: MacRuby/trunk/array.c =================================================================== --- MacRuby/trunk/array.c 2009-12-29 02:56:25 UTC (rev 3176) +++ MacRuby/trunk/array.c 2009-12-29 03:10:07 UTC (rev 3177) @@ -4257,7 +4257,7 @@ * element in the array, and so on. */ -#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1060 +#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070 # define NSCFARRAY_CNAME "NSCFArray" #else # define NSCFARRAY_CNAME "__NSCFArray" Modified: MacRuby/trunk/hash.c =================================================================== --- MacRuby/trunk/hash.c 2009-12-29 02:56:25 UTC (rev 3176) +++ MacRuby/trunk/hash.c 2009-12-29 03:10:07 UTC (rev 3177) @@ -2534,7 +2534,7 @@ * */ -#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1060 +#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070 # define NSCFDICTIONARY_CNAME "NSCFDictionary" #else # define NSCFDICTIONARY_CNAME "__NSCFDictionary" Modified: MacRuby/trunk/numeric.c =================================================================== --- MacRuby/trunk/numeric.c 2009-12-29 02:56:25 UTC (rev 3176) +++ MacRuby/trunk/numeric.c 2009-12-29 03:10:07 UTC (rev 3177) @@ -3381,7 +3381,7 @@ (IMP)imp_nsnumber_to_int, "@@:"); } -#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1060 +#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070 # define NSCFNUMBER_CNAME "NSCFNumber" #else # define NSCFNUMBER_CNAME "__NSCFNumber" Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2009-12-29 02:56:25 UTC (rev 3176) +++ MacRuby/trunk/string.c 2009-12-29 03:10:07 UTC (rev 3177) @@ -5613,7 +5613,7 @@ * */ -#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1060 +#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070 # define NSCFSTRING_CNAME "NSCFString" #else # define NSCFSTRING_CNAME "__NSCFString"

1 0

[3176] MacRuby/trunk/numeric.c
by source_changes＠macosforge.org 29 Dec '09

29 Dec '09

Revision: 3176 http://trac.macosforge.org/projects/ruby/changeset/3176 Author: vincent.isambart(a)gmail.com Date: 2009-12-28 18:56:25 -0800 (Mon, 28 Dec 2009) Log Message: ----------- fixed Fixnum#odd? and Fixnum#even? Modified Paths: -------------- MacRuby/trunk/numeric.c Modified: MacRuby/trunk/numeric.c =================================================================== --- MacRuby/trunk/numeric.c 2009-12-28 23:25:16 UTC (rev 3175) +++ MacRuby/trunk/numeric.c 2009-12-29 02:56:25 UTC (rev 3176) @@ -3283,7 +3283,7 @@ static VALUE fix_odd_p(VALUE num, SEL sel) { - if (num & 2) { + if (FIX2LONG(num) & 1) { return Qtrue; } return Qfalse; @@ -3299,7 +3299,7 @@ static VALUE fix_even_p(VALUE num, SEL sel) { - if (num & 2) { + if (FIX2LONG(num) & 1) { return Qfalse; } return Qtrue;

1 0

[3175] MacRuby/trunk
by source_changes＠macosforge.org 28 Dec '09

28 Dec '09

Revision: 3175 http://trac.macosforge.org/projects/ruby/changeset/3175 Author: lsansonetti(a)apple.com Date: 2009-12-28 15:25:16 -0800 (Mon, 28 Dec 2009) Log Message: ----------- fix a bug when retrieving the hidden NSCF classes on the bleeding edge Modified Paths: -------------- MacRuby/trunk/array.c MacRuby/trunk/hash.c MacRuby/trunk/numeric.c MacRuby/trunk/string.c Modified: MacRuby/trunk/array.c =================================================================== --- MacRuby/trunk/array.c 2009-12-25 02:13:36 UTC (rev 3174) +++ MacRuby/trunk/array.c 2009-12-28 23:25:16 UTC (rev 3175) @@ -4257,10 +4257,17 @@ * element in the array, and so on. */ +#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1060 +# define NSCFARRAY_CNAME "NSCFArray" +#else +# define NSCFARRAY_CNAME "__NSCFArray" +#endif + void Init_Array(void) { - rb_cCFArray = (VALUE)objc_getClass("NSCFArray"); + rb_cCFArray = (VALUE)objc_getClass(NSCFARRAY_CNAME); + assert(rb_cCFArray != 0); #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 rb_cNSArray0 = (VALUE)objc_getClass("__NSArray0"); #endif Modified: MacRuby/trunk/hash.c =================================================================== --- MacRuby/trunk/hash.c 2009-12-25 02:13:36 UTC (rev 3174) +++ MacRuby/trunk/hash.c 2009-12-28 23:25:16 UTC (rev 3175) @@ -2534,6 +2534,12 @@ * */ +#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1060 +# define NSCFDICTIONARY_CNAME "NSCFDictionary" +#else +# define NSCFDICTIONARY_CNAME "__NSCFDictionary" +#endif + void Init_Hash(void) { @@ -2543,7 +2549,8 @@ id_hash = rb_intern("hash"); id_yield = rb_intern("yield"); - rb_cCFHash = (VALUE)objc_getClass("NSCFDictionary"); + rb_cCFHash = (VALUE)objc_getClass(NSCFDICTIONARY_CNAME); + assert(rb_cCFHash != 0); #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 rb_cNSHash0 = (VALUE)objc_getClass("__NSDictionary0"); #endif Modified: MacRuby/trunk/numeric.c =================================================================== --- MacRuby/trunk/numeric.c 2009-12-25 02:13:36 UTC (rev 3174) +++ MacRuby/trunk/numeric.c 2009-12-28 23:25:16 UTC (rev 3175) @@ -3381,6 +3381,12 @@ (IMP)imp_nsnumber_to_int, "@@:"); } +#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1060 +# define NSCFNUMBER_CNAME "NSCFNumber" +#else +# define NSCFNUMBER_CNAME "__NSCFNumber" +#endif + void Init_Numeric(void) { @@ -3395,7 +3401,8 @@ rb_eZeroDivError = rb_define_class("ZeroDivisionError", rb_eStandardError); rb_eFloatDomainError = rb_define_class("FloatDomainError", rb_eRangeError); rb_cNSNumber = (VALUE)objc_getClass("NSNumber"); - rb_cCFNumber = (VALUE)objc_getClass("NSCFNumber"); + rb_cCFNumber = (VALUE)objc_getClass(NSCFNUMBER_CNAME); + assert(rb_cCFNumber != 0); rb_cNumeric = rb_define_class("Numeric", rb_cNSNumber); RCLASS_SET_VERSION_FLAG(rb_cNumeric, RCLASS_IS_OBJECT_SUBCLASS); rb_define_object_special_methods(rb_cNumeric); Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2009-12-25 02:13:36 UTC (rev 3174) +++ MacRuby/trunk/string.c 2009-12-28 23:25:16 UTC (rev 3175) @@ -5613,10 +5613,17 @@ * */ +#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1060 +# define NSCFSTRING_CNAME "NSCFString" +#else +# define NSCFSTRING_CNAME "__NSCFString" +#endif + void Init_String(void) { - rb_cCFString = (VALUE)objc_getClass("NSCFString"); + rb_cCFString = (VALUE)objc_getClass(NSCFSTRING_CNAME); + assert(rb_cCFString != 0); rb_const_set(rb_cObject, rb_intern("NSCFString"), rb_cCFString); rb_cString = rb_cNSString = (VALUE)objc_getClass("NSString"); rb_cNSMutableString = (VALUE)objc_getClass("NSMutableString");

1 0

[3174] MacRuby/trunk/file.c
by source_changes＠macosforge.org 25 Dec '09

25 Dec '09

Revision: 3174 http://trac.macosforge.org/projects/ruby/changeset/3174 Author: lsansonetti(a)apple.com Date: 2009-12-24 18:13:36 -0800 (Thu, 24 Dec 2009) Log Message: ----------- optimized #to_path Modified Paths: -------------- MacRuby/trunk/file.c Modified: MacRuby/trunk/file.c =================================================================== --- MacRuby/trunk/file.c 2009-12-25 02:13:12 UTC (rev 3173) +++ MacRuby/trunk/file.c 2009-12-25 02:13:36 UTC (rev 3174) @@ -15,8 +15,10 @@ #include "ruby/io.h" #include "ruby/signal.h" #include "ruby/util.h" +#include "ruby/node.h" #include "dln.h" #include "objc.h" +#include "vm.h" #ifdef HAVE_UNISTD_H #include <unistd.h> @@ -91,26 +93,22 @@ VALUE rb_mFileTest; VALUE rb_cStat; +static SEL selToPath = 0; + static VALUE rb_get_path_check(VALUE obj, int check) { - VALUE tmp; - static ID to_path; - if (check) { rb_check_safe_obj(obj); } - tmp = rb_check_string_type(obj); + VALUE tmp = rb_check_string_type(obj); if (!NIL_P(tmp)) { goto exit; } - if (!to_path) { - to_path = rb_intern("to_path"); + if (rb_vm_respond_to(obj, selToPath, true)) { + tmp = rb_vm_call(obj, selToPath, 0, NULL, false); } - if (rb_respond_to(obj, to_path)) { - tmp = rb_funcall(obj, to_path, 0, 0); - } else { tmp = obj; } @@ -3944,6 +3942,8 @@ rb_mFileTest = rb_define_module("FileTest"); rb_cFile = rb_define_class("File", rb_cIO); + selToPath = sel_registerName("to_path"); + define_filetest_function("directory?", rb_file_directory_p, 1); define_filetest_function("exist?", rb_file_exist_p, 1); define_filetest_function("exists?", rb_file_exist_p, 1);

1 0

[3173] MacRuby/trunk/load.c
by source_changes＠macosforge.org 25 Dec '09

25 Dec '09

Revision: 3173 http://trac.macosforge.org/projects/ruby/changeset/3173 Author: lsansonetti(a)apple.com Date: 2009-12-24 18:13:12 -0800 (Thu, 24 Dec 2009) Log Message: ----------- #require: make sure the given argument is handled as a path, not a string Modified Paths: -------------- MacRuby/trunk/load.c Modified: MacRuby/trunk/load.c =================================================================== --- MacRuby/trunk/load.c 2009-12-24 23:18:43 UTC (rev 3172) +++ MacRuby/trunk/load.c 2009-12-25 02:13:12 UTC (rev 3173) @@ -261,19 +261,18 @@ VALUE rb_require_safe(VALUE fname, int safe) { - StringValue(fname); + FilePathValue(fname); - VALUE result = Qnil; - VALUE path; - int type = 0; - // Immediately, check out if we have an AOT feature for this. if (rb_vm_aot_feature_load(RSTRING_PTR(fname))) { rb_provide_feature(fname); return Qtrue; } - FilePathValue(fname); + VALUE result = Qnil; + VALUE path; + int type = 0; + if (search_required(fname, &path, &type)) { if (path == 0) { result = Qfalse;

1 0

[3172] MacRuby/branches/ticket159/compiler.cpp
by source_changes＠macosforge.org 24 Dec '09

24 Dec '09

Revision: 3172 http://trac.macosforge.org/projects/ruby/changeset/3172 Author: emoy(a)apple.com Date: 2009-12-24 15:18:43 -0800 (Thu, 24 Dec 2009) Log Message: ----------- Branch ticket159: fix compiler warning and minor clean up Modified Paths: -------------- MacRuby/branches/ticket159/compiler.cpp Modified: MacRuby/branches/ticket159/compiler.cpp =================================================================== --- MacRuby/branches/ticket159/compiler.cpp 2009-12-24 04:39:30 UTC (rev 3171) +++ MacRuby/branches/ticket159/compiler.cpp 2009-12-24 23:18:43 UTC (rev 3172) @@ -2470,13 +2470,6 @@ } } - if (newFloatFunc == NULL) { - // VALUE rb_float_new_retained(double) - newFloatFunc = cast<Function> - (module->getOrInsertFunction("rb_float_new_retained", - RubyObjTy, DoubleTy, NULL)); - } - rb_vm_immediate_val_t leftImm, rightImm; const bool leftIsImmediateConst = unbox_immediate_val(leftRVal, &leftImm); @@ -2586,8 +2579,8 @@ BranchInst::Create(not_redefined_bb, dispatch_bb, isOpRedefined, bb); - BasicBlock *div_by_zero_bb; - BasicBlock *optimize_fixnum_cont_bb; + BasicBlock *div_by_zero_bb = NULL; + BasicBlock *optimize_fixnum_cont_bb = NULL; BasicBlock *optimize_fixnum_ret_bb; /* * In the case of integer division, we need to test for the @@ -2763,6 +2756,13 @@ if (!result_is_predicate) { // Box the float. + if (newFloatFunc == NULL) { + // VALUE rb_float_new_retained(double) + newFloatFunc = cast<Function> + (module->getOrInsertFunction("rb_float_new_retained", + RubyObjTy, DoubleTy, + NULL)); + } std::vector<Value *> params; params.push_back(flp_op_res); flp_op_res = CallInst::Create(newFloatFunc, params.begin(),

1 0

[3171] MacRuby/trunk/spec/macruby/core/pointer_spec.rb
by source_changes＠macosforge.org 24 Dec '09

24 Dec '09

Revision: 3171 http://trac.macosforge.org/projects/ruby/changeset/3171 Author: lsansonetti(a)apple.com Date: 2009-12-23 20:39:30 -0800 (Wed, 23 Dec 2009) Log Message: ----------- added more Pointer specs to cover the latest changes Modified Paths: -------------- MacRuby/trunk/spec/macruby/core/pointer_spec.rb Modified: MacRuby/trunk/spec/macruby/core/pointer_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/pointer_spec.rb 2009-12-24 04:39:04 UTC (rev 3170) +++ MacRuby/trunk/spec/macruby/core/pointer_spec.rb 2009-12-24 04:39:30 UTC (rev 3171) @@ -46,6 +46,15 @@ it "accepts the type returned by NSRect" do Pointer.new(NSRect.type).type.should == NSRect.type end + + it "accepts a non mandatory second argument that specifies the number of elements that should be allocated" do + lambda { Pointer.new('i', 1) }.should_not raise_error + end + + it "raises an ArgumentError if the second argument (size) is not greater than 0" do + lambda { Pointer.new('i', -1) }.should raise_error(ArgumentError) + lambda { Pointer.new('i', 0) }.should raise_error(ArgumentError) + end end describe "Pointer, through #[] and #[]=" do @@ -130,4 +139,34 @@ ptr[2].class.should == Fixnum ptr[2].chr.should == 'y' end + + it "will raise a TypeError exception in case the given index cannot be converted to a numeric type" do + pointer = Pointer.new('i') + lambda { pointer[nil] }.should raise_error(TypeError) + lambda { pointer[nil] = 42 }.should raise_error(TypeError) + lambda { pointer['omg'] }.should raise_error(TypeError) + lambda { pointer['omg'] = 42 }.should raise_error(TypeError) + end + + it "will raise an ArgumentError exception in case the given index is negative" do + pointer = Pointer.new('i') + lambda { pointer[-1] }.should raise_error(ArgumentError) + lambda { pointer[-1] = 42 }.should raise_error(ArgumentError) + end + + it "will raise an ArgumentError exception in case the given index is out of bounds" do + pointer = Pointer.new('i') + lambda { pointer[0] }.should_not raise_error + lambda { pointer[0] = 42 }.should_not raise_error + lambda { pointer[1] }.should raise_error(ArgumentError) + lambda { pointer[1] = 42 }.should raise_error(ArgumentError) + + pointer = Pointer.new('i', 3) + 3.times do |i| + lambda { pointer[i] }.should_not raise_error + lambda { pointer[i] = 42 }.should_not raise_error + end + lambda { pointer[3] }.should raise_error(ArgumentError) + lambda { pointer[3] = 42 }.should raise_error(ArgumentError) + end end

1 0