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

[3531] MacRuby/trunk
by source_changes＠macosforge.org 15 Feb '10

15 Feb '10

Revision: 3531 http://trac.macosforge.org/projects/ruby/changeset/3531 Author: lsansonetti(a)apple.com Date: 2010-02-15 14:47:12 -0800 (Mon, 15 Feb 2010) Log Message: ----------- Array#join: convert separator as string, Array#<=>: return nil if given obj is not array, Array#dup/#clone: appropriately handle singleton classes, fixed misc bugs in eql Modified Paths: -------------- MacRuby/trunk/NSArray.m MacRuby/trunk/array.c Modified: MacRuby/trunk/NSArray.m =================================================================== --- MacRuby/trunk/NSArray.m 2010-02-15 22:44:42 UTC (rev 3530) +++ MacRuby/trunk/NSArray.m 2010-02-15 22:47:12 UTC (rev 3531) @@ -1225,6 +1225,10 @@ return rb_str_new(0, 0); } + if (!NIL_P(sep)) { + StringValue(sep); + } + bool taint = false; if (OBJ_TAINTED(ary) || OBJ_TAINTED(sep)) { taint = true; @@ -1237,31 +1241,29 @@ VALUE result = rb_str_new(0, 0); for (long i = 0, count = RARRAY_LEN(ary); i < count; i++) { - VALUE tmp = RARRAY_AT(ary, i); - switch (TYPE(tmp)) { + VALUE elem = RARRAY_AT(ary, i); + switch (TYPE(elem)) { case T_STRING: break; case T_ARRAY: { - VALUE args[2]; - - args[0] = tmp; - args[1] = sep; - tmp = rb_exec_recursive(recursive_join, ary, (VALUE)args); + VALUE args[2] = {elem, sep}; + elem = rb_exec_recursive(recursive_join, ary, (VALUE)args); } break; default: - tmp = rb_obj_as_string(tmp); + elem = rb_obj_as_string(elem); + break; } if (i > 0 && !NIL_P(sep)) { rb_str_buf_append(result, sep); } - rb_str_buf_append(result, tmp); + rb_str_buf_append(result, elem); - if (OBJ_TAINTED(tmp)) { + if (OBJ_TAINTED(elem)) { taint = true; } - if (OBJ_UNTRUSTED(tmp)) { + if (OBJ_UNTRUSTED(elem)) { untrust = true; } } Modified: MacRuby/trunk/array.c =================================================================== --- MacRuby/trunk/array.c 2010-02-15 22:44:42 UTC (rev 3530) +++ MacRuby/trunk/array.c 2010-02-15 22:47:12 UTC (rev 3531) @@ -156,9 +156,6 @@ if (x == y) { return Qtrue; } - if (SPECIAL_CONST_P(x) && SPECIAL_CONST_P(y) && TYPE(x) == TYPE(y)) { - return Qfalse; - } if (SYMBOL_P(x)) { return x == y ? Qtrue : Qfalse; } @@ -827,7 +824,7 @@ assert(origin < RARY(ary)->len); for (size_t i = origin; i < RARY(ary)->len; i++) { VALUE item2 = rary_elt(ary, i); - if (rb_equal_fast(item, item2) == Qtrue) { + if (rb_equal_fast(item2, item) == Qtrue) { return i; } } @@ -1189,12 +1186,25 @@ return RARY(ary)->len == 0 ? Qtrue : Qfalse; } +static VALUE +rary_copy(VALUE rcv, VALUE klass) +{ + VALUE dup = rary_alloc(klass, 0); + rary_concat(dup, rcv, 0, RARY(rcv)->len); + return dup; +} + VALUE rary_dup(VALUE ary, SEL sel) { - VALUE dup = rary_alloc(rb_cRubyArray, 0); - rary_concat(dup, ary, 0, RARY(ary)->len); - *(VALUE *)dup = *(VALUE *)ary; + VALUE klass = CLASS_OF(ary); + while (RCLASS_SINGLETON(klass)) { + klass = RCLASS_SUPER(klass); + } + assert(rb_klass_is_rary(klass)); + + VALUE dup = rary_copy(ary, klass); + if (OBJ_TAINTED(ary)) { OBJ_TAINT(dup); } @@ -1207,7 +1217,14 @@ static VALUE rary_clone(VALUE ary, SEL sel) { - VALUE clone = rary_dup(ary, 0); + VALUE clone = rary_copy(ary, CLASS_OF(ary)); + + if (OBJ_TAINTED(ary)) { + OBJ_TAINT(clone); + } + if (OBJ_UNTRUSTED(ary)) { + OBJ_UNTRUST(clone); + } if (OBJ_FROZEN(ary)) { OBJ_FREEZE(clone); } @@ -2356,7 +2373,10 @@ VALUE rary_cmp(VALUE ary1, SEL sel, VALUE ary2) { - ary2 = to_ary(ary2); + ary2 = rb_check_array_type(ary2); + if (NIL_P(ary2)) { + return Qnil; + } if (ary1 == ary2) { return INT2FIX(0); } @@ -2505,6 +2525,7 @@ for (size_t i = 0; i < n; i++) { VALUE item = rary_elt(ary, i); size_t pos = i + 1; + while (pos < n && (pos = rary_index_of_item(ary, pos, item)) != NOT_FOUND) { rary_erase(ary, pos, 1);

1 0

[3530] MacRuby/trunk/hash.c
by source_changes＠macosforge.org 15 Feb '10

15 Feb '10

Revision: 3530 http://trac.macosforge.org/projects/ruby/changeset/3530 Author: lsansonetti(a)apple.com Date: 2010-02-15 14:44:42 -0800 (Mon, 15 Feb 2010) Log Message: ----------- Hash#clone: keep singleton classes Modified Paths: -------------- MacRuby/trunk/hash.c Modified: MacRuby/trunk/hash.c =================================================================== --- MacRuby/trunk/hash.c 2010-02-15 22:44:17 UTC (rev 3529) +++ MacRuby/trunk/hash.c 2010-02-15 22:44:42 UTC (rev 3530) @@ -151,6 +151,18 @@ return (VALUE)hash; } +static VALUE +rhash_copy(VALUE rcv, VALUE klass) +{ + NEWOBJ(dup, rb_hash_t); + dup->basic.flags = 0; + dup->basic.klass = klass; + GC_WB(&dup->tbl, st_copy(RHASH(rcv)->tbl)); + GC_WB(&dup->ifnone, RHASH(rcv)->ifnone); + dup->has_proc_default = RHASH(rcv)->has_proc_default; + return (VALUE)dup; +} + VALUE rhash_dup(VALUE rcv, SEL sel) { @@ -160,22 +172,22 @@ } assert(rb_klass_is_rhash(klass)); - NEWOBJ(dup, rb_hash_t); - dup->basic.flags = 0; - dup->basic.klass = klass; - GC_WB(&dup->tbl, st_copy(RHASH(rcv)->tbl)); - GC_WB(&dup->ifnone, RHASH(rcv)->ifnone); - dup->has_proc_default = RHASH(rcv)->has_proc_default; + VALUE dup = rhash_copy(rcv, klass); + if (OBJ_TAINTED(rcv)) { OBJ_TAINT(dup); } - return (VALUE)dup; + return dup; } static VALUE rhash_clone(VALUE rcv, SEL sel) { - VALUE clone = rhash_dup(rcv, 0); + VALUE clone = rhash_copy(rcv, CLASS_OF(rcv)); + + if (OBJ_TAINTED(rcv)) { + OBJ_TAINT(clone); + } if (OBJ_FROZEN(rcv)) { OBJ_FREEZE(clone); }

1 0

[3529] MacRuby/trunk/object.c
by source_changes＠macosforge.org 15 Feb '10

15 Feb '10

Revision: 3529 http://trac.macosforge.org/projects/ruby/changeset/3529 Author: lsansonetti(a)apple.com Date: 2010-02-15 14:44:17 -0800 (Mon, 15 Feb 2010) Log Message: ----------- rb_equal(): fix style + remove inline Modified Paths: -------------- MacRuby/trunk/object.c Modified: MacRuby/trunk/object.c =================================================================== --- MacRuby/trunk/object.c 2010-02-15 16:14:10 UTC (rev 3528) +++ MacRuby/trunk/object.c 2010-02-15 22:44:17 UTC (rev 3529) @@ -63,15 +63,13 @@ * to provide meaningful semantics in <code>case</code> statements. */ -inline VALUE +VALUE rb_equal(VALUE obj1, VALUE obj2) { - VALUE result; - if (obj1 == obj2) { return Qtrue; } - result = rb_vm_call_with_cache(eqCache, obj1, selEq, 1, &obj2); + VALUE result = rb_vm_call_with_cache(eqCache, obj1, selEq, 1, &obj2); if (RTEST(result)) { return Qtrue; }

1 0

[3528] MacRuby/trunk/bin/ruby_deploy
by source_changes＠macosforge.org 15 Feb '10

15 Feb '10

Revision: 3528 http://trac.macosforge.org/projects/ruby/changeset/3528 Author: eloy.de.enige(a)gmail.com Date: 2010-02-15 08:14:10 -0800 (Mon, 15 Feb 2010) Log Message: ----------- ruby_deploy: Add --verbose and --stdlib. The latter option allows you to specify the name of a stdlib lib to keep. Also compile *all* .rb files in the app bundle, including those in the embeded framework and fix the binaries if the framework is embeded. For instance, using `--stdlib digest' would keep: * usr/lib/ruby/site_ruby/1.9.0/digest.rb * usr/lib/ruby/site_ruby/1.9.0/digest/hmac.rb * usr/lib/ruby/site_ruby/1.9.0/digest/sha2.rb * usr/lib/ruby/site_ruby/1.9.0/universal-darwin10.0/digest.bundle * usr/lib/ruby/site_ruby/1.9.0/universal-darwin10.0/digest/bubblebabble.bundle * usr/lib/ruby/site_ruby/1.9.0/universal-darwin10.0/digest/md5.bundle * usr/lib/ruby/site_ruby/1.9.0/universal-darwin10.0/digest/rmd160.bundle * usr/lib/ruby/site_ruby/1.9.0/universal-darwin10.0/digest/sha1.bundle * usr/lib/ruby/site_ruby/1.9.0/universal-darwin10.0/digest/sha2.bundle Note that this is done purely based on the name of the lib. Modified Paths: -------------- MacRuby/trunk/bin/ruby_deploy Modified: MacRuby/trunk/bin/ruby_deploy =================================================================== --- MacRuby/trunk/bin/ruby_deploy 2010-02-15 15:43:22 UTC (rev 3527) +++ MacRuby/trunk/bin/ruby_deploy 2010-02-15 16:14:10 UTC (rev 3528) @@ -7,19 +7,20 @@ require 'optparse' require 'rbconfig' -require 'fileutils' class Deployer - include FileUtils - NAME = File.basename(__FILE__) def initialize(argv) + @stdlib = [] + OptionParser.new do |opts| opts.banner = "Usage: #{NAME} [options] application-bundle" - opts.on('--compile', 'Compile the bundle source code') { @compile = true } - opts.on('--embed', 'Embed MacRuby inside the bundle') { @embed = true } - opts.on('--no-stdlib', "Do not embed the standard library") { @no_stdlib = true } + opts.on('--compile', 'Compile the bundle source code') { @compile = true } + opts.on('--embed', 'Embed MacRuby inside the bundle') { @embed = true } + opts.on('--no-stdlib', 'Do not embed the standard library') { @no_stdlib = true } + opts.on('--stdlib [LIB]', 'Embed only LIB from the standard library') { |lib| @stdlib << lib } + opts.on('--verbose', 'Log actions to standard out') { @verbose = true } opts.on('-v', '--version', 'Display the version') do puts RUBY_DESCRIPTION exit 1 @@ -33,63 +34,95 @@ @app_bundle = argv[0] end - if !File.exist?(@app_bundle) - die "Given path `#{@app_bundle}' doesn't exist" - end - if !File.directory?(@app_bundle) or !File.exist?(File.join(@app_bundle, 'Contents')) - die "Given path `#{@app_bundle}' doesn't seem to be a valid application bundle" - end + ensure_path @app_bundle + ensure_path File.join(@app_bundle, 'Contents'), "Path `%s' doesn't seem to be a valid application bundle" # Locate necessary programs. @install_name_tool = locate('install_name_tool') # Locate the MacRuby framework. @macruby_framework_path = Config::CONFIG['libdir'].scan(/^.+MacRuby\.framework/)[0] - if !File.exist?(@macruby_framework_path) - die "Cannot locate MacRuby.framework from rbconfig.rb" - end + ensure_path @macruby_framework_path, "Cannot locate MacRuby.framework from rbconfig.rb" end def run die "Nothing to do, please specify --compile or --embed" if !@compile and !@embed die "--no-stdlib can only be used with --embed" if @no_stdlib and !@embed + die "--stdlib can only be used with --embed" if !(a)stdlib.empty? and !@embed + embed if @embed compile if @compile - embed if @embed end private + # FileUtils::Verbose doesn't work with MacRuby yet. However, it doesn't print + # out failures anyways, just the command. Use the command-line tools directly + # to circumvent this. + { :cp_r => 'cp -R', :mkdir_p => 'mkdir -p', :rm_rf => 'rm -rf' }.each do |name, cmd| + module_eval <<-END, __FILE__, __LINE__ + 1 + def #{name}(*args) + execute "#{cmd} \#{args.map { |a| "'\#{a}'" }.join(' ')}" + end + END + end + + def app_frameworks + File.join(@app_bundle, 'Contents/Frameworks') + end + + def app_macruby + File.join(app_frameworks, 'MacRuby.framework') + end + + def app_macruby_usr + File.join(app_macruby, 'Versions', MACRUBY_VERSION, 'usr') + end + + def macruby_usr + @macruby_usr ||= ensure_path(File.join(@macruby_framework_path, 'Versions', MACRUBY_VERSION, 'usr')) + end + + def compile_files + Dir.glob(File.join(@app_bundle, 'Contents/Resources/*.rb')) + + Dir.glob(File.join(app_macruby_usr, '**/*.rb')) + end + def compile - Dir.glob(File.join(@app_bundle, 'Contents/Resources/*.rb')).each do |source| + compile_files.each do |source| base = File.basename(source, '.rb') next if base == 'rb_main' obj = File.join(File.dirname(source), base + '.rbo') if !File.exist?(obj) or File.mtime(source) > File.mtime(obj) - die "Can't compile \"#{source}\"" unless system("macrubyc -C \"#{source}\" -o \"#{obj}\"") - FileUtils.rm_f(source) + execute("macrubyc -C \"#{source}\" -o \"#{obj}\"", "Can't compile \"#{source}\"") end + rm_rf(source) end + fix_install_name if File.exist?(app_macruby) end + STDLIB_PATTERN = "lib/ruby/{,site_ruby/}1.9.*{,/universal-darwin*}" + KEEP_STDLIB_PATTERN = "{%s}{,{.,/**/*.}{rb,rbo,bundle}}" + def embed # Copy MacRuby.framework inside MyApp.app/Contents/Frameworks. - app_frameworks = File.join(@app_bundle, 'Contents/Frameworks') mkdir_p(app_frameworks) - app_macruby = File.join(app_frameworks, 'MacRuby.framework') rm_rf(app_macruby) cp_r(@macruby_framework_path, app_frameworks) # Delete unnecessary things in the MacRuby.framework copy. - app_macruby_usr = File.join(app_macruby, 'Versions', MACRUBY_VERSION, 'usr') - macruby_usr = File.join(@macruby_framework_path, 'Versions', MACRUBY_VERSION, 'usr') - die "oops" if !File.exist?(app_macruby_usr) or !File.exist?(macruby_usr) dirs = ['bin', 'include', 'lib/libmacruby-static.a', 'share'] - if @no_stdlib - dirs << 'lib/ruby' - end + dirs << 'lib/ruby' if @no_stdlib dirs << 'lib/ruby/Gems' # TODO add gems support dirs.each { |x| rm_rf(File.join(app_macruby_usr, x)) } + # Only keep specific libs from stdlib. + unless @stdlib.empty? + lib = File.join(app_macruby_usr, STDLIB_PATTERN) + all, keep = ["**/*", KEEP_STDLIB_PATTERN % @stdlib.join(',')].map { |p| Dir.glob(File.join(lib, p)) } + keep.reject! { |f| File.extname(f) == '.rb' && keep.include?("#{f}o") } # only keep .rbo for duplicates + all.select { |f| keep.grep(/^#{f}/).empty? }.each { |x| rm_rf(x) } + end + # Only keep the Current version of the MacRuby.framework copy. Dir.glob(File.join(app_macruby, 'Versions/*')).select { |x| base = File.basename(x) @@ -98,9 +131,14 @@ rm_rf(x) } - # Hack the application binaries to link against the MacRuby.framework copy. - patterns = [File.join(@app_bundle, 'Contents/MacOS/*'), - File.join(app_macruby_usr, 'lib/ruby/**/*.{bundle,rbo}'), + # Wait with fixing install name until all binaries are available. + fix_install_name unless @compile + end + + # Hack the application binaries to link against the MacRuby.framework copy. + def fix_install_name + patterns = [File.join(@app_bundle, 'Contents/MacOS/*'), + File.join(app_macruby_usr, 'lib/ruby/**/*.{bundle,rbo}'), File.join(@app_bundle, 'Contents/Resources/*.rbo')] patterns.each do |pat| Dir.glob(pat).each do |bin| @@ -109,9 +147,10 @@ end end - def execute(line) + def execute(line, error_message = nil) + $stdout.puts(line) if @verbose ret = `#{line}` - die "Error when executing `#{line}'" unless $?.success? + die(error_message || "Error when executing `#{line}'") unless $?.success? ret end @@ -121,6 +160,11 @@ path end + def ensure_path(path, message = "Path does not exist `%s'") + die(message % path) unless File.exist?(path) + path + end + def die(*args) $stderr.puts args exit 1

1 0

[3527] MacRuby/trunk/bin/rubyc
by source_changes＠macosforge.org 15 Feb '10

15 Feb '10

Revision: 3527 http://trac.macosforge.org/projects/ruby/changeset/3527 Author: martinlagardette(a)apple.com Date: 2010-02-15 07:43:22 -0800 (Mon, 15 Feb 2010) Log Message: ----------- - When compiling and no arch was passed, use Xxode ARCHS env var if available - Fixes #579 Modified Paths: -------------- MacRuby/trunk/bin/rubyc Modified: MacRuby/trunk/bin/rubyc =================================================================== --- MacRuby/trunk/bin/rubyc 2010-02-14 08:06:07 UTC (rev 3526) +++ MacRuby/trunk/bin/rubyc 2010-02-15 15:43:22 UTC (rev 3527) @@ -41,7 +41,15 @@ die "Invalid mode `#{@mode}'. Possible choices are: normal, full" end @archs.uniq! - @archs << RUBY_ARCH if @archs.empty? + if @archs.empty? + if not ENV['ARCHS'].empty? + # Copy Xcode way of doing it: + # Use intersection of ARCHS and VALID_ARCHS + @archs = ENV['ARCHS'].split & VALID_ARCHS + else + @archs << RUBY_ARCH + end + end @archs.each do |arch| if not VALID_ARCHS.include?(arch) die "Invalid CPU architecture `#{arch}'. Possible values are: " + VALID_ARCHS.join(", ")

1 0

[3526] MacRuby/trunk/test_vm
by source_changes＠macosforge.org 14 Feb '10

14 Feb '10

Revision: 3526 http://trac.macosforge.org/projects/ruby/changeset/3526 Author: vincent.isambart(a)gmail.com Date: 2010-02-14 00:06:07 -0800 (Sun, 14 Feb 2010) Log Message: ----------- fixed incorrect test_vm tests (found by testing with the last 1.9) Modified Paths: -------------- MacRuby/trunk/test_vm/block.rb MacRuby/trunk/test_vm/dispatch.rb Modified: MacRuby/trunk/test_vm/block.rb =================================================================== --- MacRuby/trunk/test_vm/block.rb 2010-02-14 02:39:54 UTC (rev 3525) +++ MacRuby/trunk/test_vm/block.rb 2010-02-14 08:06:07 UTC (rev 3526) @@ -734,5 +734,5 @@ def foo lambda { yield }.call end - p(foo { :ok })' -} \ No newline at end of file + p(foo { :ok }) +} Modified: MacRuby/trunk/test_vm/dispatch.rb =================================================================== --- MacRuby/trunk/test_vm/dispatch.rb 2010-02-14 02:39:54 UTC (rev 3525) +++ MacRuby/trunk/test_vm/dispatch.rb 2010-02-14 08:06:07 UTC (rev 3526) @@ -13,7 +13,7 @@ assert "42", "def foo(x, y, z=123); x+y+z; end; p foo(20, 20, 2)" assert "42", "def foo(x, y=20, z=2); x+y+z; end; p foo(20)" assert "42", "def foo(x, y=123, z=2); x+y+z; end; p foo(30, 10)" -assert "42", "def foo; 42; end; p self.foo" +assert "42", "def foo; :ko; end; begin; p self.foo; rescue NoMethodError; p 42 end" assert "126", "def foo(a=b=c=42); a+b+c; end; p foo" assert "[42, nil]", "def f(a=X::x=b=1) p [a, b] end; f(42)" @@ -442,8 +442,9 @@ begin A.new + p :ok rescue ArgumentError - p :ok + p :ko end } @@ -495,4 +496,4 @@ $SAFE=4 s="omg" s.freeze -} \ No newline at end of file +}

1 0

[3525] MacRuby/trunk/spec/frozen/tags/macruby/core/kernel/caller_tags.txt
by source_changes＠macosforge.org 14 Feb '10

14 Feb '10

Revision: 3525 http://trac.macosforge.org/projects/ruby/changeset/3525 Author: lsansonetti(a)apple.com Date: 2010-02-13 18:39:54 -0800 (Sat, 13 Feb 2010) Log Message: ----------- untag spec that now passes Modified Paths: -------------- MacRuby/trunk/spec/frozen/tags/macruby/core/kernel/caller_tags.txt Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/kernel/caller_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/kernel/caller_tags.txt 2010-02-14 02:39:35 UTC (rev 3524) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/kernel/caller_tags.txt 2010-02-14 02:39:54 UTC (rev 3525) @@ -1,5 +1,4 @@ fails:Kernel#caller returns the current call stack -fails:Kernel#caller omits a number of frames corresponding to the parameter fails:Kernel#caller in a Proc or eval returns the definition trace of a block when evaluated in a Proc binding fails:Kernel#caller in a Proc or eval returns the definition trace of a Proc fails:Kernel#caller in a Proc or eval returns the correct caller line from a called Proc

1 0

[3524] MacRuby/trunk
by source_changes＠macosforge.org 14 Feb '10

14 Feb '10

Revision: 3524 http://trac.macosforge.org/projects/ruby/changeset/3524 Author: lsansonetti(a)apple.com Date: 2010-02-13 18:39:35 -0800 (Sat, 13 Feb 2010) Log Message: ----------- Kernel#caller: now honor the skip argument Modified Paths: -------------- MacRuby/trunk/debugger.cpp MacRuby/trunk/vm.cpp MacRuby/trunk/vm.h MacRuby/trunk/vm_eval.c Modified: MacRuby/trunk/debugger.cpp =================================================================== --- MacRuby/trunk/debugger.cpp 2010-02-13 09:21:24 UTC (rev 3523) +++ MacRuby/trunk/debugger.cpp 2010-02-14 02:39:35 UTC (rev 3524) @@ -315,7 +315,7 @@ continue; } if (strcmp(cmd, "backtrace") == 0) { - VALUE bt = rb_vm_backtrace(100); + VALUE bt = rb_vm_backtrace(0); VALUE str = rb_ary_join(bt, rb_str_new2("\n")); send(RSTRING_PTR(str)); continue; Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2010-02-13 09:21:24 UTC (rev 3523) +++ MacRuby/trunk/vm.cpp 2010-02-14 02:39:35 UTC (rev 3524) @@ -3503,7 +3503,7 @@ { VALUE exception = GET_VM()->current_exception(); assert(exception != Qnil); - rb_iv_set(exception, "bt", rb_vm_backtrace(100)); + rb_iv_set(exception, "bt", rb_vm_backtrace(0)); __vm_raise(); } @@ -3511,7 +3511,7 @@ void rb_vm_raise(VALUE exception) { - rb_iv_set(exception, "bt", rb_vm_backtrace(100)); + rb_iv_set(exception, "bt", rb_vm_backtrace(0)); rb_objc_retain((void *)exception); GET_VM()->push_current_exception(exception); __vm_raise(); @@ -3678,8 +3678,10 @@ extern "C" VALUE -rb_vm_backtrace(int level) +rb_vm_backtrace(int skip) { + assert(skip >= 0); + void *callstack[128]; int callstack_n = backtrace(callstack, 128); @@ -3710,6 +3712,10 @@ } } + while (skip-- > 0) { + rb_ary_shift(ary); + } + return ary; } Modified: MacRuby/trunk/vm.h =================================================================== --- MacRuby/trunk/vm.h 2010-02-13 09:21:24 UTC (rev 3523) +++ MacRuby/trunk/vm.h 2010-02-14 02:39:35 UTC (rev 3524) @@ -453,7 +453,7 @@ void rb_vm_raise_current_exception(void); VALUE rb_vm_current_exception(void); void rb_vm_set_current_exception(VALUE exception); -VALUE rb_vm_backtrace(int level); +VALUE rb_vm_backtrace(int skip); void rb_vm_print_current_exception(void); #define TEST_THREAD_CANCEL() (pthread_testcancel()) Modified: MacRuby/trunk/vm_eval.c =================================================================== --- MacRuby/trunk/vm_eval.c 2010-02-13 09:21:24 UTC (rev 3523) +++ MacRuby/trunk/vm_eval.c 2010-02-14 02:39:35 UTC (rev 3524) @@ -736,10 +736,9 @@ rb_f_caller(VALUE klass, SEL sel, int argc, VALUE *argv) { VALUE level; - int lev; - rb_scan_args(argc, argv, "01", &level); + int lev; if (NIL_P(level)) { lev = 1; } @@ -751,19 +750,14 @@ rb_raise(rb_eArgError, "negative level (%d)", lev); } - VALUE ary = rb_vm_backtrace(lev); - rb_ary_shift(ary); // remove #caller - return ary; + return rb_vm_backtrace(lev); } void rb_backtrace(void) { - long i, count; - VALUE ary; - - ary = rb_vm_backtrace(-1); - for (i = 0, count = RARRAY_LEN(ary); i < count; i++) { + VALUE ary = rb_vm_backtrace(0); + for (long i = 0, count = RARRAY_LEN(ary); i < count; i++) { printf("\tfrom %s\n", RSTRING_PTR(RARRAY_AT(ary, i))); } } @@ -771,7 +765,7 @@ VALUE rb_make_backtrace(void) { - return rb_vm_backtrace(-1); + return rb_vm_backtrace(0); } void

1 0

[3523] MacRuby/trunk/spec/frozen/tags/macruby/core/kernel/ respond_to_missing_tags.txt
by source_changes＠macosforge.org 13 Feb '10

13 Feb '10

Revision: 3523 http://trac.macosforge.org/projects/ruby/changeset/3523 Author: lsansonetti(a)apple.com Date: 2010-02-13 01:21:24 -0800 (Sat, 13 Feb 2010) Log Message: ----------- untagging specs that now pass Removed Paths: ------------- MacRuby/trunk/spec/frozen/tags/macruby/core/kernel/respond_to_missing_tags.txt Deleted: MacRuby/trunk/spec/frozen/tags/macruby/core/kernel/respond_to_missing_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/kernel/respond_to_missing_tags.txt 2010-02-13 09:21:08 UTC (rev 3522) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/kernel/respond_to_missing_tags.txt 2010-02-13 09:21:24 UTC (rev 3523) @@ -1,10 +0,0 @@ -fails:Kernel#respond_to_missing? returns false by default -fails:Kernel#respond_to_missing? is called when #respond_to? would return false -fails:Kernel#respond_to_missing? is called with true as the second argument when #respond_to? is -fails:Kernel#respond_to_missing? causes #respond_to? to return true if called and not returning false -fails:Kernel#respond_to_missing? causes #respond_to? to return false if called and returning false -fails:Kernel#respond_to_missing? is not called with false as a second argument when #respond_to? is -fails:Kernel#respond_to_missing? is called when obj responds to the given private method, include_private = false -fails:Kernel#respond_to_missing? is called for missing class methods -fails:Kernel#respond_to_missing? is called with a 2nd argument of false when #respond_to? is -fails:Kernel#respond_to_missing? is called a 2nd argument of false when #respond_to? is called with only 1 argument

1 0

[3522] MacRuby/trunk/vm_method.c
by source_changes＠macosforge.org 13 Feb '10

13 Feb '10

Revision: 3522 http://trac.macosforge.org/projects/ruby/changeset/3522 Author: lsansonetti(a)apple.com Date: 2010-02-13 01:21:08 -0800 (Sat, 13 Feb 2010) Log Message: ----------- Kernel#respond_to_missing?: added Modified Paths: -------------- MacRuby/trunk/vm_method.c Modified: MacRuby/trunk/vm_method.c =================================================================== --- MacRuby/trunk/vm_method.c 2010-02-13 06:26:40 UTC (rev 3521) +++ MacRuby/trunk/vm_method.c 2010-02-13 09:21:08 UTC (rev 3522) @@ -240,6 +240,8 @@ * C.method_defined? "method4" #=> false */ +static SEL selRespondToDefault = 0; + static bool rb_obj_respond_to2(VALUE obj, VALUE klass, ID id, bool priv, bool check_override) { @@ -249,7 +251,12 @@ char buf[100]; snprintf(buf, sizeof buf, "%s:", id_name); sel = sel_registerName(buf); - return rb_vm_respond_to2(obj, klass, sel, priv, check_override); + if (!rb_vm_respond_to2(obj, klass, sel, priv, check_override)) { + VALUE args[2]; + args[0] = ID2SYM(id); + args[1] = priv ? Qtrue : Qfalse; + return RTEST(rb_vm_call(obj, selRespondToDefault, 2, args, false)); + } } return true; } @@ -638,9 +645,16 @@ * call-seq: * obj.respond_to?(symbol, include_private=false) => true or false * - * Returns +true+> if _obj_ responds to the given + * Returns +true+ if _obj_ responds to the given * method. Private methods are included in the search only if the * optional second parameter evaluates to +true+. + * + * If the method is not implemented, + * as Process.fork on Windows, File.lchmod on GNU/Linux, etc., + * false is returned. + * + * If the method is not defined, <code>respond_to_missing?</code> + * method is called and the result is returned. */ bool @@ -655,15 +669,6 @@ return rb_obj_respond_to(obj, id, false); } -/* - * call-seq: - * obj.respond_to?(symbol, include_private=false) => true or false - * - * Returns +true+> if _obj_ responds to the given - * method. Private methods are included in the search only if the - * optional second parameter evaluates to +true+. - */ - static VALUE obj_respond_to(VALUE obj, SEL sel, int argc, VALUE *argv) { @@ -675,15 +680,32 @@ return rb_obj_respond_to2(obj, Qnil, id, RTEST(priv), false) ? Qtrue : Qfalse; } +/* + * call-seq: + * obj.respond_to_missing?(symbol, include_private) => true or false + * + * Hook method to return whether the _obj_ can respond to _id_ method + * or not. + * + * See #respond_to?. + */ + +static VALUE +obj_respond_to_missing(VALUE obj, SEL sel, VALUE sym, VALUE priv) +{ + return Qfalse; +} + IMP basic_respond_to_imp = NULL; void Init_eval_method(void) { rb_objc_define_method(rb_mKernel, "respond_to?", obj_respond_to, -1); - basic_respond_to_imp = class_getMethodImplementation((Class)rb_mKernel, selRespondTo); - //basic_respond_to = rb_method_node(rb_cObject, idRespond_to); - //rb_register_mark_object((VALUE)basic_respond_to); + rb_objc_define_method(rb_mKernel, "respond_to_missing?", obj_respond_to_missing, 2); + selRespondToDefault = sel_registerName("respond_to_missing?:"); + basic_respond_to_imp = class_getMethodImplementation((Class)rb_mKernel, + selRespondTo); rb_objc_define_private_method(rb_cModule, "remove_method", rb_mod_remove_method, -1); rb_objc_define_private_method(rb_cModule, "undef_method", rb_mod_undef_method, -1); @@ -694,9 +716,12 @@ rb_objc_define_private_method(rb_cModule, "module_function", rb_mod_modfunc, -1); rb_objc_define_method(rb_cModule, "method_defined?", rb_mod_method_defined, 1); - rb_objc_define_method(rb_cModule, "public_method_defined?", rb_mod_public_method_defined, 1); - rb_objc_define_method(rb_cModule, "private_method_defined?", rb_mod_private_method_defined, 1); - rb_objc_define_method(rb_cModule, "protected_method_defined?", rb_mod_protected_method_defined, 1); + rb_objc_define_method(rb_cModule, "public_method_defined?", + rb_mod_public_method_defined, 1); + rb_objc_define_method(rb_cModule, "private_method_defined?", + rb_mod_private_method_defined, 1); + rb_objc_define_method(rb_cModule, "protected_method_defined?", + rb_mod_protected_method_defined, 1); rb_objc_define_method(rb_cModule, "public_class_method", rb_mod_public_method, -1); rb_objc_define_method(rb_cModule, "private_class_method", rb_mod_private_method, -1);

1 0