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

[583] MacRuby/trunk
by source_changes＠macosforge.org 08 Sep '08

08 Sep '08

Revision: 583 http://trac.macosforge.org/projects/ruby/changeset/583 Author: lsansonetti(a)apple.com Date: 2008-09-08 15:25:28 -0700 (Mon, 08 Sep 2008) Log Message: ----------- set the CF classes as NSObject constants Modified Paths: -------------- MacRuby/trunk/array.c MacRuby/trunk/hash.c MacRuby/trunk/string.c Modified: MacRuby/trunk/array.c =================================================================== --- MacRuby/trunk/array.c 2008-09-08 22:24:58 UTC (rev 582) +++ MacRuby/trunk/array.c 2008-09-08 22:25:28 UTC (rev 583) @@ -3409,6 +3409,7 @@ Init_Array(void) { rb_cCFArray = (VALUE)objc_getClass("NSCFArray"); + rb_const_set(rb_cObject, rb_intern("NSCFArray"), rb_cCFArray); rb_cArray = rb_cNSArray = (VALUE)objc_getClass("NSArray"); rb_cNSMutableArray = (VALUE)objc_getClass("NSMutableArray"); rb_set_class_path(rb_cNSMutableArray, rb_cObject, "NSMutableArray"); Modified: MacRuby/trunk/hash.c =================================================================== --- MacRuby/trunk/hash.c 2008-09-08 22:24:58 UTC (rev 582) +++ MacRuby/trunk/hash.c 2008-09-08 22:25:28 UTC (rev 583) @@ -2384,6 +2384,7 @@ id_default = rb_intern("default"); rb_cCFHash = (VALUE)objc_getClass("NSCFDictionary"); + rb_const_set(rb_cObject, rb_intern("NSCFDictionary"), rb_cCFHash); rb_cHash = rb_cNSHash = (VALUE)objc_getClass("NSDictionary"); rb_cNSMutableHash = (VALUE)objc_getClass("NSMutableDictionary"); rb_set_class_path(rb_cNSMutableHash, rb_cObject, "NSMutableDictionary"); Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2008-09-08 22:24:58 UTC (rev 582) +++ MacRuby/trunk/string.c 2008-09-08 22:25:28 UTC (rev 583) @@ -5281,6 +5281,7 @@ Init_String(void) { rb_cCFString = (VALUE)objc_getClass("NSCFString"); + rb_const_set(rb_cObject, rb_intern("NSCFString"), rb_cCFString); rb_cString = rb_cNSString = (VALUE)objc_getClass("NSString"); rb_cNSMutableString = (VALUE)objc_getClass("NSMutableString"); rb_const_set(rb_cObject, rb_intern("String"), rb_cNSMutableString);

1 0

[582] MacRuby/trunk/Rakefile
by source_changes＠macosforge.org 08 Sep '08

08 Sep '08

Revision: 582 http://trac.macosforge.org/projects/ruby/changeset/582 Author: lsansonetti(a)apple.com Date: 2008-09-08 15:24:58 -0700 (Mon, 08 Sep 2008) Log Message: ----------- adding a task to generate and install the rdoc/ri files Modified Paths: -------------- MacRuby/trunk/Rakefile Modified: MacRuby/trunk/Rakefile =================================================================== --- MacRuby/trunk/Rakefile 2008-09-08 21:02:00 UTC (rev 581) +++ MacRuby/trunk/Rakefile 2008-09-08 22:24:58 UTC (rev 582) @@ -607,6 +607,15 @@ desc "Same as framework:install" task :install => 'framework:install' +desc "Generate and install RDoc/RI" +task :install_doc => 'miniruby' do + doc_op = '.ext/rdoc' + unless File.exist?(doc_op) + sh "./miniruby -I./lib bin/rdoc --all --ri --op \"#{doc_op}\"" + end + sh "./miniruby instruby.rb #{INSTRUBY_ARGS} --install=rdoc --rdoc-output=\"#{doc_op}\"" +end + desc "Same as macruby:build" task :macruby => 'macruby:build'

1 0

[581] MacRuby/trunk/string.c
by source_changes＠macosforge.org 08 Sep '08

08 Sep '08

Revision: 581 http://trac.macosforge.org/projects/ruby/changeset/581 Author: lsansonetti(a)apple.com Date: 2008-09-08 14:02:00 -0700 (Mon, 08 Sep 2008) Log Message: ----------- more GC hints, to make sure rdoc's rsize is constant Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2008-09-08 21:01:28 UTC (rev 580) +++ MacRuby/trunk/string.c 2008-09-08 21:02:00 UTC (rev 581) @@ -413,6 +413,8 @@ CFMakeCollectable((CFTypeRef)dup); + rb_gc_malloc_increase(32 + (sizeof(UniChar) * RSTRING_LEN(dup))); + return dup; } @@ -822,6 +824,7 @@ data = (CFMutableDataRef)rb_str_cfdata2(str); if (data != NULL) { CFDataAppendBytes(data, (const UInt8 *)ptr, len); + rb_gc_malloc_increase(sizeof(UniChar) * len); } else { long slen;

1 0

[580] MacRuby/trunk/Rakefile
by source_changes＠macosforge.org 08 Sep '08

08 Sep '08

Revision: 580 http://trac.macosforge.org/projects/ruby/changeset/580 Author: lsansonetti(a)apple.com Date: 2008-09-08 14:01:28 -0700 (Mon, 08 Sep 2008) Log Message: ----------- avoid infinite recursion Modified Paths: -------------- MacRuby/trunk/Rakefile Modified: MacRuby/trunk/Rakefile =================================================================== --- MacRuby/trunk/Rakefile 2008-09-08 19:49:12 UTC (rev 579) +++ MacRuby/trunk/Rakefile 2008-09-08 21:01:28 UTC (rev 580) @@ -181,7 +181,7 @@ txt = File.read(src) txt.scan(/#include\s+\"([^"]+)\"/).flatten.each do |header| p = header_path(header) - if p + if p and !cont.include?(p) cont << p locate_headers(cont, p) end

1 0

[579] MacRuby/branches/testing
by source_changes＠macosforge.org 08 Sep '08

08 Sep '08

Revision: 579 http://trac.macosforge.org/projects/ruby/changeset/579 Author: lsansonetti(a)apple.com Date: 2008-09-08 12:49:12 -0700 (Mon, 08 Sep 2008) Log Message: ----------- backport fixes from trunk Modified Paths: -------------- MacRuby/branches/testing/Rakefile MacRuby/branches/testing/debug.h Modified: MacRuby/branches/testing/Rakefile =================================================================== --- MacRuby/branches/testing/Rakefile 2008-09-08 19:48:50 UTC (rev 578) +++ MacRuby/branches/testing/Rakefile 2008-09-08 19:49:12 UTC (rev 579) @@ -21,7 +21,7 @@ NO_WARN_BUILD = !do_option('allow_build_warnings', false) BUILD_AS_EMBEDDABLE = do_option('build_as_embeddable', false) ENABLE_STATIC_LIBRARY = do_option('enable_static_library', 'no') { 'yes' } -ENABLE_DEBUG_LOGGING = do_option('enable_debug_logging', true) +ENABLE_DEBUG_LOGGING = do_option('enable_debug_logging', true) { |x| x == 'true' } # TODO: we should find a way to document these options in rake's --help Modified: MacRuby/branches/testing/debug.h =================================================================== --- MacRuby/branches/testing/debug.h 2008-09-08 19:48:50 UTC (rev 578) +++ MacRuby/branches/testing/debug.h 2008-09-08 19:49:12 UTC (rev 579) @@ -29,8 +29,8 @@ void ruby_debug_breakpoint(void); void ruby_debug_gc_check_func(void); +#include "vm_core.h" #if ENABLE_DEBUG_LOGGING -# include "vm_core.h" # include <libgen.h> extern bool ruby_dlog_enabled; extern FILE *ruby_dlog_file;

1 0

[578] MacRuby/trunk/debug.h
by source_changes＠macosforge.org 08 Sep '08

08 Sep '08

Revision: 578 http://trac.macosforge.org/projects/ruby/changeset/578 Author: lsansonetti(a)apple.com Date: 2008-09-08 12:48:50 -0700 (Mon, 08 Sep 2008) Log Message: ----------- include vm_core even if the debug logging is disabled Modified Paths: -------------- MacRuby/trunk/debug.h Modified: MacRuby/trunk/debug.h =================================================================== --- MacRuby/trunk/debug.h 2008-09-08 19:48:32 UTC (rev 577) +++ MacRuby/trunk/debug.h 2008-09-08 19:48:50 UTC (rev 578) @@ -29,8 +29,8 @@ void ruby_debug_breakpoint(void); void ruby_debug_gc_check_func(void); +#include "vm_core.h" #if ENABLE_DEBUG_LOGGING -# include "vm_core.h" # include <libgen.h> extern bool ruby_dlog_enabled; extern FILE *ruby_dlog_file;

1 0

[577] MacRuby/trunk/Rakefile
by source_changes＠macosforge.org 08 Sep '08

08 Sep '08

Revision: 577 http://trac.macosforge.org/projects/ruby/changeset/577 Author: lsansonetti(a)apple.com Date: 2008-09-08 12:48:32 -0700 (Mon, 08 Sep 2008) Log Message: ----------- make sure passing 'enable_debug_logging=false' actually works Modified Paths: -------------- MacRuby/trunk/Rakefile Modified: MacRuby/trunk/Rakefile =================================================================== --- MacRuby/trunk/Rakefile 2008-09-08 06:36:47 UTC (rev 576) +++ MacRuby/trunk/Rakefile 2008-09-08 19:48:32 UTC (rev 577) @@ -21,7 +21,7 @@ NO_WARN_BUILD = !do_option('allow_build_warnings', false) BUILD_AS_EMBEDDABLE = do_option('build_as_embeddable', false) ENABLE_STATIC_LIBRARY = do_option('enable_static_library', 'no') { 'yes' } -ENABLE_DEBUG_LOGGING = do_option('enable_debug_logging', true) +ENABLE_DEBUG_LOGGING = do_option('enable_debug_logging', true) { |x| x == 'true' } # TODO: we should find a way to document these options in rake's --help

1 0

[576] MacRuby/trunk/io.c
by source_changes＠macosforge.org 08 Sep '08

08 Sep '08

Revision: 576 http://trac.macosforge.org/projects/ruby/changeset/576 Author: lsansonetti(a)apple.com Date: 2008-09-07 23:36:47 -0700 (Sun, 07 Sep 2008) Log Message: ----------- fixed a bug introduced by the latest commit Modified Paths: -------------- MacRuby/trunk/io.c Modified: MacRuby/trunk/io.c =================================================================== --- MacRuby/trunk/io.c 2008-09-08 06:36:41 UTC (rev 575) +++ MacRuby/trunk/io.c 2008-09-08 06:36:47 UTC (rev 576) @@ -711,9 +711,8 @@ } } - len = RSTRING_BYTELEN(str); + len = RSTRING_LEN(str); if ((n = len) <= 0) { - RSTRING_SYNC(str); return n; } if (fptr->wbuf == NULL && !(fptr->mode & FMODE_SYNC)) { @@ -730,16 +729,14 @@ MEMMOVE(fptr->wbuf, fptr->wbuf+fptr->wbuf_off, char, fptr->wbuf_len); fptr->wbuf_off = 0; } - MEMMOVE(fptr->wbuf+fptr->wbuf_off+fptr->wbuf_len, RSTRING_BYTEPTR(str)+offset, char, len); + MEMMOVE(fptr->wbuf+fptr->wbuf_off+fptr->wbuf_len, RSTRING_PTR(str)+offset, char, len); fptr->wbuf_len += len; n = 0; } if (io_fflush(fptr) < 0) { - RSTRING_SYNC(str); return -1L; } if (n == 0) { - RSTRING_SYNC(str); return len; } /* avoid context switch between "a" and "\n" in STDERR.puts "a". @@ -755,10 +752,9 @@ wsplit_p(fptr)) { l = PIPE_BUF; } - r = rb_write_internal(fptr->fd, RSTRING_BYTEPTR(str)+offset, l); + r = rb_write_internal(fptr->fd, ((char *)RSTRING_PTR(str))+offset, l); /* xxx: other threads may modify given string. */ if (r == n) { - RSTRING_SYNC(str); return len; } if (0 <= r) { @@ -768,10 +764,9 @@ } if (rb_io_wait_writable(fptr->fd)) { rb_io_check_closed(fptr); - if (offset < RSTRING_BYTELEN(str)) + if (offset < RSTRING_LEN(str)) goto retry; } - RSTRING_SYNC(str); return -1L; } @@ -780,9 +775,8 @@ MEMMOVE(fptr->wbuf, fptr->wbuf+fptr->wbuf_off, char, fptr->wbuf_len); fptr->wbuf_off = 0; } - MEMMOVE(fptr->wbuf+fptr->wbuf_off+fptr->wbuf_len, RSTRING_BYTEPTR(str)+offset, char, len); + MEMMOVE(fptr->wbuf+fptr->wbuf_off+fptr->wbuf_len, RSTRING_PTR(str)+offset, char, len); fptr->wbuf_len += len; - RSTRING_SYNC(str); return len; } @@ -4829,11 +4823,10 @@ } line = rb_obj_as_string(argv[i]); rb_io_write(out, line); - if (RSTRING_BYTELEN(line) == 0 || - RSTRING_BYTEPTR(line)[RSTRING_BYTELEN(line)-1] != '\n') { + if (RSTRING_LEN(line) == 0 || + RSTRING_PTR(line)[RSTRING_LEN(line)-1] != '\n') { rb_io_write(out, rb_default_rs); } - RSTRING_SYNC(line); } return Qnil;

1 0

[575] MacRuby/branches/testing/io.c
by source_changes＠macosforge.org 08 Sep '08

08 Sep '08

Revision: 575 http://trac.macosforge.org/projects/ruby/changeset/575 Author: lsansonetti(a)apple.com Date: 2008-09-07 23:36:41 -0700 (Sun, 07 Sep 2008) Log Message: ----------- fixed a bug introduced by the latest commit Modified Paths: -------------- MacRuby/branches/testing/io.c Modified: MacRuby/branches/testing/io.c =================================================================== --- MacRuby/branches/testing/io.c 2008-09-08 04:03:35 UTC (rev 574) +++ MacRuby/branches/testing/io.c 2008-09-08 06:36:41 UTC (rev 575) @@ -711,9 +711,8 @@ } } - len = RSTRING_BYTELEN(str); + len = RSTRING_LEN(str); if ((n = len) <= 0) { - RSTRING_SYNC(str); return n; } if (fptr->wbuf == NULL && !(fptr->mode & FMODE_SYNC)) { @@ -730,16 +729,14 @@ MEMMOVE(fptr->wbuf, fptr->wbuf+fptr->wbuf_off, char, fptr->wbuf_len); fptr->wbuf_off = 0; } - MEMMOVE(fptr->wbuf+fptr->wbuf_off+fptr->wbuf_len, RSTRING_BYTEPTR(str)+offset, char, len); + MEMMOVE(fptr->wbuf+fptr->wbuf_off+fptr->wbuf_len, RSTRING_PTR(str)+offset, char, len); fptr->wbuf_len += len; n = 0; } if (io_fflush(fptr) < 0) { - RSTRING_SYNC(str); return -1L; } if (n == 0) { - RSTRING_SYNC(str); return len; } /* avoid context switch between "a" and "\n" in STDERR.puts "a". @@ -755,10 +752,9 @@ wsplit_p(fptr)) { l = PIPE_BUF; } - r = rb_write_internal(fptr->fd, RSTRING_BYTEPTR(str)+offset, l); + r = rb_write_internal(fptr->fd, ((char *)RSTRING_PTR(str))+offset, l); /* xxx: other threads may modify given string. */ if (r == n) { - RSTRING_SYNC(str); return len; } if (0 <= r) { @@ -768,10 +764,9 @@ } if (rb_io_wait_writable(fptr->fd)) { rb_io_check_closed(fptr); - if (offset < RSTRING_BYTELEN(str)) + if (offset < RSTRING_LEN(str)) goto retry; } - RSTRING_SYNC(str); return -1L; } @@ -780,9 +775,8 @@ MEMMOVE(fptr->wbuf, fptr->wbuf+fptr->wbuf_off, char, fptr->wbuf_len); fptr->wbuf_off = 0; } - MEMMOVE(fptr->wbuf+fptr->wbuf_off+fptr->wbuf_len, RSTRING_BYTEPTR(str)+offset, char, len); + MEMMOVE(fptr->wbuf+fptr->wbuf_off+fptr->wbuf_len, RSTRING_PTR(str)+offset, char, len); fptr->wbuf_len += len; - RSTRING_SYNC(str); return len; } @@ -4829,11 +4823,10 @@ } line = rb_obj_as_string(argv[i]); rb_io_write(out, line); - if (RSTRING_BYTELEN(line) == 0 || - RSTRING_BYTEPTR(line)[RSTRING_BYTELEN(line)-1] != '\n') { + if (RSTRING_LEN(line) == 0 || + RSTRING_PTR(line)[RSTRING_LEN(line)-1] != '\n') { rb_io_write(out, rb_default_rs); } - RSTRING_SYNC(line); } return Qnil;

1 0

[574] MacRuby/branches/testing
by source_changes＠macosforge.org 08 Sep '08

08 Sep '08

Revision: 574 http://trac.macosforge.org/projects/ruby/changeset/574 Author: lsansonetti(a)apple.com Date: 2008-09-07 21:03:35 -0700 (Sun, 07 Sep 2008) Log Message: ----------- backport fixes from trunk Modified Paths: -------------- MacRuby/branches/testing/instruby.rb MacRuby/branches/testing/io.c Modified: MacRuby/branches/testing/instruby.rb =================================================================== --- MacRuby/branches/testing/instruby.rb 2008-09-08 03:53:47 UTC (rev 573) +++ MacRuby/branches/testing/instruby.rb 2008-09-08 04:03:35 UTC (rev 574) @@ -527,9 +527,11 @@ end end Dir.glob('/System/Library/Frameworks/**/BridgeSupport/*.dylib').each do |p| - unless system("./markgc '#{p}' >& /dev/null") - $stderr.puts "cannot markgc #{p}" - exit 1 + unless File.exist?(touch_file) + unless system("./markgc '#{p}' >& /dev/null") + $stderr.puts "cannot markgc #{p}" + exit 1 + end end unless $destdir.empty? dirname = File.dirname(p) Modified: MacRuby/branches/testing/io.c =================================================================== --- MacRuby/branches/testing/io.c 2008-09-08 03:53:47 UTC (rev 573) +++ MacRuby/branches/testing/io.c 2008-09-08 04:03:35 UTC (rev 574) @@ -712,7 +712,10 @@ } len = RSTRING_BYTELEN(str); - if ((n = len) <= 0) return n; + if ((n = len) <= 0) { + RSTRING_SYNC(str); + return n; + } if (fptr->wbuf == NULL && !(fptr->mode & FMODE_SYNC)) { fptr->wbuf_off = 0; fptr->wbuf_len = 0; @@ -731,10 +734,14 @@ fptr->wbuf_len += len; n = 0; } - if (io_fflush(fptr) < 0) + if (io_fflush(fptr) < 0) { + RSTRING_SYNC(str); return -1L; - if (n == 0) + } + if (n == 0) { + RSTRING_SYNC(str); return len; + } /* avoid context switch between "a" and "\n" in STDERR.puts "a". [ruby-dev:25080] */ if (fptr->stdio_file != stderr && !rb_thread_fd_writable(fptr->fd)) { @@ -750,7 +757,10 @@ } r = rb_write_internal(fptr->fd, RSTRING_BYTEPTR(str)+offset, l); /* xxx: other threads may modify given string. */ - if (r == n) return len; + if (r == n) { + RSTRING_SYNC(str); + return len; + } if (0 <= r) { offset += r; n -= r; @@ -761,6 +771,7 @@ if (offset < RSTRING_BYTELEN(str)) goto retry; } + RSTRING_SYNC(str); return -1L; } @@ -771,6 +782,7 @@ } MEMMOVE(fptr->wbuf+fptr->wbuf_off+fptr->wbuf_len, RSTRING_BYTEPTR(str)+offset, char, len); fptr->wbuf_len += len; + RSTRING_SYNC(str); return len; } @@ -4821,6 +4833,7 @@ RSTRING_BYTEPTR(line)[RSTRING_BYTELEN(line)-1] != '\n') { rb_io_write(out, rb_default_rs); } + RSTRING_SYNC(line); } return Qnil;

1 0