September 2010 - macruby-changes - lists.macosforge.org

[4493] MacRuby/trunk
by source_changes＠macosforge.org 03 Sep '10

03 Sep '10

Revision: 4493 http://trac.macosforge.org/projects/ruby/changeset/4493 Author: lsansonetti(a)apple.com Date: 2010-09-02 19:37:28 -0700 (Thu, 02 Sep 2010) Log Message: ----------- when a thread exists prematurely because of an exception, write a message on stderr once the thread object is being finalized only if #join was never called Modified Paths: -------------- MacRuby/trunk/thread.c MacRuby/trunk/vm.cpp MacRuby/trunk/vm.h Modified: MacRuby/trunk/thread.c =================================================================== --- MacRuby/trunk/thread.c 2010-09-03 01:59:54 UTC (rev 4492) +++ MacRuby/trunk/thread.c 2010-09-03 02:37:28 UTC (rev 4493) @@ -10,6 +10,7 @@ #include "ruby/macruby.h" #include "ruby/node.h" #include "vm.h" +#include "objc.h" VALUE rb_cThread; VALUE rb_cThGroup; @@ -47,6 +48,23 @@ return Data_Wrap_Struct(rb_cThread, NULL, NULL, t); } +static IMP +thread_finalize_imp_super = NULL; + +static void +thread_finalize_imp(void *rcv, SEL sel) +{ + rb_vm_thread_t *t = GetThreadPtr(rcv); + if (t->exception != Qnil && !t->joined_on_exception) { + fprintf(stderr, "*** Thread %p exited prematurely because of an uncaught exception:\n%s\n", + t->thread, + rb_str_cstr(rb_format_exception_message(t->exception))); + } + if (thread_finalize_imp_super != NULL) { + ((void(*)(void *, SEL))thread_finalize_imp_super)(rcv, sel); + } +} + static VALUE thread_initialize(VALUE thread, SEL sel, int argc, const VALUE *argv) { @@ -215,9 +233,9 @@ // If the thread was terminated because of an exception, we need to // propagate it. if (t->exception != Qnil) { + t->joined_on_exception = true; rb_exc_raise(t->exception); } - return self; } @@ -1568,6 +1586,9 @@ rb_cThread = rb_define_class("Thread", rb_cObject); rb_objc_define_method(*(VALUE *)rb_cThread, "alloc", thread_s_alloc, 0); + thread_finalize_imp_super = rb_objc_install_method2((Class)rb_cThread, + "finalize", (IMP)thread_finalize_imp); + rb_objc_define_method(*(VALUE *)rb_cThread, "start", thread_start, -1); rb_objc_define_method(*(VALUE *)rb_cThread, "fork", thread_start, -1); rb_objc_define_method(*(VALUE *)rb_cThread, "main", rb_thread_s_main, 0); Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2010-09-03 01:59:54 UTC (rev 4492) +++ MacRuby/trunk/vm.cpp 2010-09-03 02:37:28 UTC (rev 4493) @@ -4543,6 +4543,7 @@ t->status = THREAD_ALIVE; t->in_cond_wait = false; t->abort_on_exception = false; + t->joined_on_exception = false; t->group = Qnil; // will be set right after t->mutexes = Qnil; Modified: MacRuby/trunk/vm.h =================================================================== --- MacRuby/trunk/vm.h 2010-09-03 01:59:54 UTC (rev 4492) +++ MacRuby/trunk/vm.h 2010-09-03 02:37:28 UTC (rev 4493) @@ -150,6 +150,7 @@ rb_vm_thread_status_t status; bool in_cond_wait; bool abort_on_exception; // per-local state, global one is in RoxorCore + bool joined_on_exception; VALUE locals; // a Hash object or Qnil VALUE exception; // killed-by exception or Qnil VALUE group; // always a ThreadGroup object

1 0

[4492] MacRuby/trunk/gcd.c
by source_changes＠macosforge.org 03 Sep '10

03 Sep '10

Revision: 4492 http://trac.macosforge.org/projects/ruby/changeset/4492 Author: lsansonetti(a)apple.com Date: 2010-09-02 18:59:54 -0700 (Thu, 02 Sep 2010) Log Message: ----------- when a GCD block exists because of an uncaught exception, write a message on stderr Modified Paths: -------------- MacRuby/trunk/gcd.c Modified: MacRuby/trunk/gcd.c =================================================================== --- MacRuby/trunk/gcd.c 2010-09-03 01:35:21 UTC (rev 4491) +++ MacRuby/trunk/gcd.c 2010-09-03 01:59:54 UTC (rev 4492) @@ -28,8 +28,6 @@ // variable to a queue. (Not that that is a good idea.) static SEL selClose; -static aslmsg gcd_msg = NULL; -#define GCD_DEBUG(text) asl_log(NULL, gcd_msg, ASL_LEVEL_DEBUG, "%s", text) // TODO: Make Queue and Source inherit from Dispatch::Base // so they can use a common definition of suspend/resume @@ -326,7 +324,6 @@ { OSSpinLockLock(&_suspensionLock); while (queue->suspension_count > 0) { - GCD_DEBUG("Finalizing a suspended queue."); queue->suspension_count--; dispatch_resume(queue->queue); } @@ -342,10 +339,9 @@ } static VALUE -rb_block_rescue(VALUE data) +rb_block_rescue(VALUE data, VALUE exc) { - char *text = (char *)data; - GCD_DEBUG(text); + fprintf(stderr, "*** Dispatch block exited prematurely because of an uncaught exception:\n%s\n", rb_str_cstr(rb_format_exception_message(exc))); return Qnil; } @@ -361,7 +357,7 @@ rb_block_dispatcher(void *data) { assert(data != NULL); - rb_rescue(rb_block_release_eval, (VALUE)data, rb_block_rescue, (VALUE)"gcd.c: Exception in rb_block_dispatcher"); + rb_rescue(rb_block_release_eval, (VALUE)data, rb_block_rescue, Qnil); } static rb_vm_block_t * @@ -1019,7 +1015,6 @@ if (src->source != NULL) { OSSpinLockLock(&_suspensionLock); while (src->suspension_count > 0) { - GCD_DEBUG("Finalizing a suspended source."); src->suspension_count--; dispatch_resume(src->source); } @@ -1129,18 +1124,12 @@ static void rb_semaphore_finalize(void *rcv, SEL sel) { - BOOL is_unbalanced = false; if (RSemaphore(rcv)->sem != NULL) { - while (dispatch_semaphore_signal(RSemaphore(rcv)->sem) != 0) { - is_unbalanced = true; - } - while (--RSemaphore(rcv)->count >= 0) { - dispatch_semaphore_signal(RSemaphore(rcv)->sem); - } - if (is_unbalanced == true) { - GCD_DEBUG("Finalizing a waiting Dispatch::Semaphore."); - } - dispatch_release(RSemaphore(rcv)->sem); + while (dispatch_semaphore_signal(RSemaphore(rcv)->sem) != 0) {} + while (--RSemaphore(rcv)->count >= 0) { + dispatch_semaphore_signal(RSemaphore(rcv)->sem); + } + dispatch_release(RSemaphore(rcv)->sem); } if (rb_semaphore_finalize_super != NULL) { ((void(*)(void *, SEL))rb_semaphore_finalize_super)(rcv, sel); @@ -1366,11 +1355,8 @@ /* Constants for future reference */ selClose = sel_registerName("close"); assert(selClose != NULL); - gcd_msg = asl_new(ASL_TYPE_MSG); - asl_set(gcd_msg, ASL_KEY_FACILITY, "org.macruby.gcd"); } - #else void

1 0

[4491] MacRuby/trunk
by source_changes＠macosforge.org 03 Sep '10

03 Sep '10

Revision: 4491 http://trac.macosforge.org/projects/ruby/changeset/4491 Author: lsansonetti(a)apple.com Date: 2010-09-02 18:35:21 -0700 (Thu, 02 Sep 2010) Log Message: ----------- lock up some impure functions to avoid race conditions Modified Paths: -------------- MacRuby/trunk/bridgesupport.cpp MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/bridgesupport.cpp =================================================================== --- MacRuby/trunk/bridgesupport.cpp 2010-09-03 01:10:20 UTC (rev 4490) +++ MacRuby/trunk/bridgesupport.cpp 2010-09-03 01:35:21 UTC (rev 4491) @@ -391,8 +391,10 @@ { // Generate the real #new method. rb_vm_bs_boxed_t *bs_boxed = locate_bs_boxed(rcv, true); + GET_CORE()->lock(); Function *f = RoxorCompiler::shared->compile_bs_struct_new(bs_boxed); IMP imp = GET_CORE()->compile(f); + GET_CORE()->unlock(); // Replace the fake method with the new one in the runtime. rb_objc_define_method(*(VALUE *)rcv, "new", (void *)imp, -1); @@ -425,9 +427,11 @@ assert(field != -1); // Generate the new setter method. + GET_CORE()->lock(); Function *f = RoxorCompiler::shared->compile_bs_struct_writer( bs_boxed, field); IMP imp = GET_CORE()->compile(f); + GET_CORE()->unlock(); // Replace the fake method with the new one in the runtime. buf[s - 1] = '='; Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2010-09-03 01:10:20 UTC (rev 4490) +++ MacRuby/trunk/vm.cpp 2010-09-03 01:35:21 UTC (rev 4491) @@ -2875,6 +2875,8 @@ void * RoxorCore::gen_to_rval_convertor(std::string type) { + RoxorCoreLock lock; + std::map<std::string, void *>::iterator iter = to_rval_convertors.find(type); if (iter != to_rval_convertors.end()) {

1 0

[4490] MacRuby/trunk/class.c
by source_changes＠macosforge.org 03 Sep '10

03 Sep '10

Revision: 4490 http://trac.macosforge.org/projects/ruby/changeset/4490 Author: lsansonetti(a)apple.com Date: 2010-09-02 18:10:20 -0700 (Thu, 02 Sep 2010) Log Message: ----------- cleanup Modified Paths: -------------- MacRuby/trunk/class.c Modified: MacRuby/trunk/class.c =================================================================== --- MacRuby/trunk/class.c 2010-09-02 02:16:14 UTC (rev 4489) +++ MacRuby/trunk/class.c 2010-09-03 01:10:20 UTC (rev 4490) @@ -597,12 +597,13 @@ if (add_methods) { // Copy methods. If original class has the basic -initialize and if the - // module has a customized -initialize, we must copy the customized version - // to the original class too. + // module has a customized -initialize, we must copy the customized + // version to the original class too. rb_vm_copy_methods((Class)module, (Class)klass); if (orig_klass != 0 && orig_klass != klass) { - Method m = class_getInstanceMethod((Class)orig_klass, selInitialize); + Method m = class_getInstanceMethod((Class)orig_klass, + selInitialize); Method m2 = class_getInstanceMethod((Class)klass, selInitialize); if (m != NULL && m2 != NULL && method_getImplementation(m) == (IMP)rb_objc_init @@ -619,7 +620,6 @@ rb_include_module2(klass, 0, module, true, true); } - /* * call-seq: * mod.included_modules -> array

1 0

[4489] MacRuby/trunk/lib/rubygems/installer.rb
by source_changes＠macosforge.org 02 Sep '10

02 Sep '10

Revision: 4489 http://trac.macosforge.org/projects/ruby/changeset/4489 Author: martinlagardette(a)apple.com Date: 2010-09-01 19:16:14 -0700 (Wed, 01 Sep 2010) Log Message: ----------- macgem asks confirmation before overriding binaries w/ different shebang - Fixes #766 Modified Paths: -------------- MacRuby/trunk/lib/rubygems/installer.rb Modified: MacRuby/trunk/lib/rubygems/installer.rb =================================================================== --- MacRuby/trunk/lib/rubygems/installer.rb 2010-09-01 23:21:37 UTC (rev 4488) +++ MacRuby/trunk/lib/rubygems/installer.rb 2010-09-02 02:16:14 UTC (rev 4489) @@ -37,6 +37,7 @@ # Raised when there is an error while building extensions. # class ExtensionBuildError < Gem::InstallError; end + class GenerateBinaryError < Gem::InstallError; end include Gem::UserInteraction @@ -321,20 +322,36 @@ # HACK some gems don't have #! in their executables, restore 2008/06 #if File.read(exec_path, 2) == '#!' then - FileUtils.rm_f bin_script_path # prior install may have been --no-wrappers + # FileUtils.rm_f bin_script_path # prior install may have been --no-wrappers - File.open bin_script_path, 'w', 0755 do |file| + bin_script_exists = File.exists?(bin_script_path) + new_shebang = shebang(filename) + File.open bin_script_path, 'r+', 0755 do |file| + if bin_script_exists + # If the first line is different than the shebang we want to insert + # we are probably overwriting a script installed by another ruby + # implementation / version + if file.readline.chomp != new_shebang + warn = <<-WARN_MESSAGE +You are installing a new version of #{bin_script_path}. +This file already exists with a different shebang, possibly from a different +ruby implementation or version. This operation may break the script. +WARN_MESSAGE + alert_warning(warn) + if not ask_yes_no("Do you still wish to continue?") + raise GenerateBinaryError, "Could not write #{bin_script_path}" + end + say "Overwrote #{bin_script_path}" if Gem.configuration.really_verbose + end + file.seek(0) + file.truncate(0) + end file.print app_script_text(filename) end say bin_script_path if Gem.configuration.really_verbose generate_windows_script bindir, filename - #else - # FileUtils.rm_f bin_script_path - # FileUtils.cp exec_path, bin_script_path, - # :verbose => Gem.configuration.really_verbose - #end end ##

1 0

[4488] MacRuby/trunk/sandbox.c
by source_changes＠macosforge.org 01 Sep '10

01 Sep '10

Revision: 4488 http://trac.macosforge.org/projects/ruby/changeset/4488 Author: lsansonetti(a)apple.com Date: 2010-09-01 16:21:37 -0700 (Wed, 01 Sep 2010) Log Message: ----------- Sandbox.new can now accept a custom profile string (as a scheme expression) Modified Paths: -------------- MacRuby/trunk/sandbox.c Modified: MacRuby/trunk/sandbox.c =================================================================== --- MacRuby/trunk/sandbox.c 2010-09-01 21:48:49 UTC (rev 4487) +++ MacRuby/trunk/sandbox.c 2010-09-01 23:21:37 UTC (rev 4488) @@ -1,5 +1,14 @@ +/* + * MacRuby interface to sandbox/seatbelt. + * + * This file is covered by the Ruby license. See COPYING for more details. + * + * Copyright (C) 2010, Apple Inc. All rights reserved. + */ + #include <sandbox.h> #include "ruby/macruby.h" +#include "ruby/util.h" static VALUE rb_cSandbox; @@ -17,11 +26,25 @@ return Data_Wrap_Struct(klass, NULL, NULL, sb); } +static VALUE +rb_sandbox_init(VALUE obj, SEL sel, VALUE profile) +{ + rb_sandbox_t *box; + + Data_Get_Struct(obj, rb_sandbox_t, box); + GC_WB(&box->profile, ruby_strdup(RSTRING_PTR(profile))); + box->flags = 0; + + return obj; +} + + static inline VALUE -predefined_sandbox(const char* name) +predefined_sandbox(const char *name) { VALUE obj = rb_sandbox_s_alloc(rb_cSandbox, 0); - rb_sandbox_t *box; Data_Get_Struct(obj, rb_sandbox_t, box); + rb_sandbox_t *box; + Data_Get_Struct(obj, rb_sandbox_t, box); box->profile = name; box->flags = SANDBOX_NAMED; return rb_obj_freeze(obj); @@ -60,7 +83,8 @@ static VALUE rb_sandbox_apply(VALUE self, SEL sel) { - rb_sandbox_t *box; Data_Get_Struct(self, rb_sandbox_t, box); + rb_sandbox_t *box; + Data_Get_Struct(self, rb_sandbox_t, box); char *error = NULL; if (sandbox_init(box->profile, box->flags, &error) == -1) { rb_raise(rb_eSecurityError, "Couldn't apply sandbox: `%s`", error); @@ -80,5 +104,6 @@ rb_objc_define_method(*(VALUE *)rb_cSandbox, "temporary_writes", rb_sandbox_s_temporary_writes, 0); rb_objc_define_method(*(VALUE *)rb_cSandbox, "pure_computation", rb_sandbox_s_pure_computation, 0); + rb_objc_define_method(rb_cSandbox, "initialize", rb_sandbox_init, 1); rb_objc_define_method(rb_cSandbox, "apply!", rb_sandbox_apply, 0); -} \ No newline at end of file +}

1 0

[4487] MacRuby/trunk
by source_changes＠macosforge.org 01 Sep '10

01 Sep '10

Revision: 4487 http://trac.macosforge.org/projects/ruby/changeset/4487 Author: martinlagardette(a)apple.com Date: 2010-09-01 14:48:49 -0700 (Wed, 01 Sep 2010) Log Message: ----------- Re-cache Obj-C variadic calls when argc is different than cached Modified Paths: -------------- MacRuby/trunk/dispatcher.cpp MacRuby/trunk/vm.h Modified: MacRuby/trunk/dispatcher.cpp =================================================================== --- MacRuby/trunk/dispatcher.cpp 2010-09-01 05:11:53 UTC (rev 4486) +++ MacRuby/trunk/dispatcher.cpp 2010-09-01 21:48:49 UTC (rev 4487) @@ -501,6 +501,7 @@ cache->sel = sel; cache->klass = klass; cache->as.ocall.imp = imp; + cache->as.ocall.argc = argc; cache->as.ocall.bs_method = GET_CORE()->find_bs_method(klass, sel); char types[200]; @@ -829,6 +830,9 @@ return v; } else if (cache->flag & MCACHE_OCALL) { + if (cache->as.ocall.argc != argc) { + goto recache; + } if (!cache_method) { cache->flag = 0; } Modified: MacRuby/trunk/vm.h =================================================================== --- MacRuby/trunk/vm.h 2010-09-01 05:11:53 UTC (rev 4486) +++ MacRuby/trunk/vm.h 2010-09-01 21:48:49 UTC (rev 4487) @@ -556,6 +556,7 @@ } rcall; struct { IMP imp; + int argc; bs_element_method_t *bs_method; rb_vm_objc_stub_t *stub; } ocall;

1 0

[4486] MacRuby/trunk/lib/tmpdir.rb
by source_changes＠macosforge.org 01 Sep '10

01 Sep '10

Revision: 4486 http://trac.macosforge.org/projects/ruby/changeset/4486 Author: lsansonetti(a)apple.com Date: 2010-08-31 22:11:53 -0700 (Tue, 31 Aug 2010) Log Message: ----------- Dir.tmpdir: returns NSTemporaryDirectory() in last resort and not /tmp Modified Paths: -------------- MacRuby/trunk/lib/tmpdir.rb Modified: MacRuby/trunk/lib/tmpdir.rb =================================================================== --- MacRuby/trunk/lib/tmpdir.rb 2010-09-01 03:45:08 UTC (rev 4485) +++ MacRuby/trunk/lib/tmpdir.rb 2010-09-01 05:11:53 UTC (rev 4486) @@ -12,22 +12,28 @@ class Dir - @@systmpdir ||= defined?(Etc.systmpdir) ? Etc.systmpdir : '/tmp' + def Dir::systmpdir + @@systmpdir ||= begin + framework 'Foundation' + NSTemporaryDirectory() + end + end ## # Returns the operating system's temporary file path. def Dir::tmpdir - tmp = '.' + tmp = nil if $SAFE > 0 - tmp = @@systmpdir + tmp = systmpdir else - for dir in [ENV['TMPDIR'], ENV['TMP'], ENV['TEMP'], @@systmpdir, '/tmp'] + for dir in [ENV['TMPDIR'], ENV['TMP'], ENV['TEMP']] if dir and stat = File.stat(dir) and stat.directory? and stat.writable? tmp = dir break end rescue nil end + tmp ||= systmpdir File.expand_path(tmp) end end

1 0

[4485] MacRuby/trunk
by source_changes＠macosforge.org 01 Sep '10

01 Sep '10

Revision: 4485 http://trac.macosforge.org/projects/ruby/changeset/4485 Author: lsansonetti(a)apple.com Date: 2010-08-31 20:45:08 -0700 (Tue, 31 Aug 2010) Log Message: ----------- avoid using rb_ary_new3() Modified Paths: -------------- MacRuby/trunk/array.c MacRuby/trunk/enum.c MacRuby/trunk/error.c MacRuby/trunk/kernel.c MacRuby/trunk/object.c MacRuby/trunk/string.c Modified: MacRuby/trunk/array.c =================================================================== --- MacRuby/trunk/array.c 2010-08-31 22:54:57 UTC (rev 4484) +++ MacRuby/trunk/array.c 2010-09-01 03:45:08 UTC (rev 4485) @@ -229,7 +229,8 @@ VALUE rb_assoc_new(VALUE car, VALUE cdr) { - return rb_ary_new3(2, car, cdr); + VALUE elems[] = { car, cdr }; + return rb_ary_new4(2, elems); } VALUE @@ -891,7 +892,7 @@ if (rb_respond_to(obj, rb_intern("to_ary"))) { return to_ary(obj); } - return rb_ary_new3(1, obj); + return rb_ary_new4(1, &obj); } static void @@ -3093,7 +3094,10 @@ if (j >= i) { j++; } - return rb_ary_new3(2, RARRAY_AT(ary, i), RARRAY_AT(ary, j)); + { + VALUE elems[] = { RARRAY_AT(ary, i), RARRAY_AT(ary, j) }; + return rb_ary_new4(2, elems); + } case 3: i = rb_genrand_real() * len; @@ -3108,9 +3112,10 @@ if (k >= l && (++k >= g)) { ++k; } + VALUE elems[] = { RARRAY_AT(ary, i), RARRAY_AT(ary, j), + RARRAY_AT(ary, k) }; + return rb_ary_new4(3, elems); } - return rb_ary_new3(3, RARRAY_AT(ary, i), RARRAY_AT(ary, j), - RARRAY_AT(ary, k)); } if ((unsigned long)n < sizeof(idx) / sizeof(idx[0])) { long sorted[sizeof(idx) / sizeof(idx[0])]; @@ -3277,7 +3282,8 @@ } else if (r == 1) { /* this is a special, easy case */ for (i = 0; i < n; i++) { - rb_yield(rb_ary_new3(1, RARRAY_AT(ary, i))); + VALUE elem = RARRAY_AT(ary, i); + rb_yield(rb_ary_new4(1, &elem)); RETURN_IF_BROKEN(); } } @@ -3354,7 +3360,8 @@ } else if (n == 1) { for (i = 0; i < len; i++) { - rb_yield(rb_ary_new3(1, RARRAY_AT(ary, i))); + VALUE elem = RARRAY_AT(ary, i); + rb_yield(rb_ary_new4(1, &elem)); RETURN_IF_BROKEN(); } } Modified: MacRuby/trunk/enum.c =================================================================== --- MacRuby/trunk/enum.c 2010-08-31 22:54:57 UTC (rev 4484) +++ MacRuby/trunk/enum.c 2010-09-01 03:45:08 UTC (rev 4485) @@ -619,7 +619,7 @@ group = rb_yield(i); values = rb_hash_aref(hash, group); if (NIL_P(values)) { - values = rb_ary_new3(1, i); + values = rb_ary_new4(1, &i); rb_hash_aset(hash, group, values); } else { @@ -1080,7 +1080,8 @@ result[0] = Qundef; if (rb_block_given_p()) { - result[1] = rb_ary_new3(2, Qnil, Qnil); + VALUE elems[] = { Qnil, Qnil }; + result[1] = rb_ary_new4(2, elems); rb_objc_block_call(obj, selEach, 0, 0, min_ii, (VALUE)result); } else { @@ -1152,7 +1153,8 @@ result[0] = Qundef; if (rb_block_given_p()) { - result[1] = rb_ary_new3(2, Qnil, Qnil); + VALUE elems[] = { Qnil, Qnil }; + result[1] = rb_ary_new4(2, elems); rb_objc_block_call(obj, selEach, 0, 0, max_ii, (VALUE)result); } else { @@ -1235,7 +1237,8 @@ enum_minmax(VALUE obj, SEL sel) { VALUE result[3]; - VALUE ary = rb_ary_new3(2, Qnil, Qnil); + VALUE elems[] = { Qnil, Qnil }; + VALUE ary = rb_ary_new4(2, elems); result[0] = Qundef; if (rb_block_given_p()) { Modified: MacRuby/trunk/error.c =================================================================== --- MacRuby/trunk/error.c 2010-08-31 22:54:57 UTC (rev 4484) +++ MacRuby/trunk/error.c 2010-09-01 03:45:08 UTC (rev 4485) @@ -527,24 +527,22 @@ VALUE rb_check_backtrace(VALUE bt) { - long i; #define BACKTRACE_ERROR "backtrace must be Array of String" - if (!NIL_P(bt)) { - int t = TYPE(bt); - - if (t == T_STRING) return rb_ary_new3(1, bt); + const int t = TYPE(bt); + if (t == T_STRING) { + return rb_ary_new4(1, &bt); + } if (t != T_ARRAY) { rb_raise(rb_eTypeError, BACKTRACE_ERROR); } - for (i=0;i<RARRAY_LEN(bt);i++) { + for (int i = 0, count = RARRAY_LEN(bt); i < count; i++) { if (TYPE(RARRAY_AT(bt, i)) != T_STRING) { rb_raise(rb_eTypeError, BACKTRACE_ERROR); } } } #undef BACKTRACE_ERROR - return bt; } Modified: MacRuby/trunk/kernel.c =================================================================== --- MacRuby/trunk/kernel.c 2010-08-31 22:54:57 UTC (rev 4484) +++ MacRuby/trunk/kernel.c 2010-09-01 03:45:08 UTC (rev 4485) @@ -187,7 +187,7 @@ VALUE ary = rb_check_convert_type(arg, T_ARRAY, "Array", "to_a"); if (NIL_P(ary)) { - ary = rb_ary_new3(1, arg); + ary = rb_ary_new4(1, &arg); } int count = RARRAY_LEN(ary); if (real_argc + count >= argv_size) { @@ -591,7 +591,7 @@ { VALUE ary = rb_check_convert_type(splat, T_ARRAY, "Array", "to_a"); if (NIL_P(ary)) { - ary = rb_ary_new3(1, splat); + ary = rb_ary_new4(1, &splat); } long i, count = RARRAY_LEN(ary); for (i = 0; i < count; i++) { @@ -883,7 +883,7 @@ { VALUE ary = rb_check_convert_type(obj, T_ARRAY, "Array", "to_a"); if (NIL_P(ary)) { - ary = rb_ary_new3(1, obj); + ary = rb_ary_new4(1, &obj); } return ary; } @@ -893,7 +893,7 @@ { VALUE ary = rb_check_convert_type(obj, T_ARRAY, "Array", "to_ary"); if (NIL_P(ary)) { - ary = rb_ary_new3(1, obj); + ary = rb_ary_new4(1, &obj); } return ary; } Modified: MacRuby/trunk/object.c =================================================================== --- MacRuby/trunk/object.c 2010-08-31 22:54:57 UTC (rev 4484) +++ MacRuby/trunk/object.c 2010-09-01 03:45:08 UTC (rev 4485) @@ -2814,7 +2814,7 @@ if (NIL_P(tmp)) { tmp = rb_check_convert_type(val, T_ARRAY, "Array", "to_a"); if (NIL_P(tmp)) { - return rb_ary_new3(1, val); + return rb_ary_new4(1, &val); } } return tmp; Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2010-08-31 22:54:57 UTC (rev 4484) +++ MacRuby/trunk/string.c 2010-09-01 03:45:08 UTC (rev 4485) @@ -3112,7 +3112,7 @@ if (len == 0) { return rb_ary_new2(0); } - return rb_ary_new3(1, str); + return rb_ary_new4(1, &str); } } @@ -5596,7 +5596,10 @@ } if (pos < 0) { failed: - return rb_ary_new3(3, str, rb_str_new(NULL,0), rb_str_new(NULL,0)); + { + VALUE elems[] = { str, rb_str_new(NULL, 0), rb_str_new(NULL, 0) }; + return rb_ary_new4(3, elems); + } } if (regex) { sep = rb_str_subpat(str, sep, 0); @@ -5606,8 +5609,9 @@ } } const long len = rb_str_chars_len(str); - return rb_ary_new3(3, rstr_substr(str, 0, pos), sep, - rstr_substr(str, pos + seplen, len - pos - seplen)); + VALUE elems[] = { rstr_substr(str, 0, pos), sep, + rstr_substr(str, pos + seplen, len - pos - seplen) }; + return rb_ary_new4(3, elems); } /* @@ -5641,7 +5645,10 @@ } if (pos < 0) { failed: - return rb_ary_new3(3, rb_str_new(NULL, 0), rb_str_new(NULL,0), str); + { + VALUE elems[] = { rb_str_new(NULL, 0), rb_str_new(NULL,0), str }; + return rb_ary_new4(3, elems); + } } if (regex) { sep = rb_reg_nth_match(0, rb_backref_get()); @@ -5650,8 +5657,9 @@ } } const long seplen = rb_str_chars_len(sep); - return rb_ary_new3(3, rstr_substr(str, 0, pos), sep, - rstr_substr(str, pos + seplen, len - pos - seplen)); + VALUE elems[] = { rstr_substr(str, 0, pos), sep, + rstr_substr(str, pos + seplen, len - pos - seplen) }; + return rb_ary_new4(3, elems); } /*

1 0