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

[4386] MacRuby/trunk/README.rdoc
by source_changes＠macosforge.org 28 Jul '10

28 Jul '10

Revision: 4386 http://trac.macosforge.org/projects/ruby/changeset/4386 Author: lsansonetti(a)apple.com Date: 2010-07-28 12:40:27 -0700 (Wed, 28 Jul 2010) Log Message: ----------- Leopard is no longer supported Modified Paths: -------------- MacRuby/trunk/README.rdoc Modified: MacRuby/trunk/README.rdoc =================================================================== --- MacRuby/trunk/README.rdoc 2010-07-27 20:01:17 UTC (rev 4385) +++ MacRuby/trunk/README.rdoc 2010-07-28 19:40:27 UTC (rev 4386) @@ -19,7 +19,7 @@ * An Intel machine. PowerPC machines are not supported anymore, but may still work. An Intel 64-bit machine (Intel Core Duo 2) is recommended. -* Mac OS X 10.5.6 or later. Mac OS X 10.6 or later is recommended. +* Mac OS X 10.6 or later. * LLVM ToT, compiled for both i386 and x86_64.

1 0

[4385] MacRuby/trunk/rakelib/builder/templates.rb
by source_changes＠macosforge.org 27 Jul '10

27 Jul '10

Revision: 4385 http://trac.macosforge.org/projects/ruby/changeset/4385 Author: martinlagardette(a)apple.com Date: 2010-07-27 13:01:17 -0700 (Tue, 27 Jul 2010) Log Message: ----------- Get rid of legacy `RC_ARCHS` in `rbconfig.rb` Modified Paths: -------------- MacRuby/trunk/rakelib/builder/templates.rb Modified: MacRuby/trunk/rakelib/builder/templates.rb =================================================================== --- MacRuby/trunk/rakelib/builder/templates.rb 2010-07-26 23:03:23 UTC (rev 4384) +++ MacRuby/trunk/rakelib/builder/templates.rb 2010-07-27 20:01:17 UTC (rev 4385) @@ -50,8 +50,6 @@ ARCHFLAGS = if e = ENV['ARCHFLAGS'] e.dup - elsif e = ENV['RC_ARCHS'] - e.split.map { |a| "-arch \#{a}" }.join(' ') else "#{archflags}" end

1 0

[4384] MacRuby/trunk/ext/openssl/ossl_pkey_rsa.c
by source_changes＠macosforge.org 26 Jul '10

26 Jul '10

Revision: 4384 http://trac.macosforge.org/projects/ruby/changeset/4384 Author: martinlagardette(a)apple.com Date: 2010-07-26 16:03:23 -0700 (Mon, 26 Jul 2010) Log Message: ----------- Fixes RSA in OpenSSL (#811) Modified Paths: -------------- MacRuby/trunk/ext/openssl/ossl_pkey_rsa.c Modified: MacRuby/trunk/ext/openssl/ossl_pkey_rsa.c =================================================================== --- MacRuby/trunk/ext/openssl/ossl_pkey_rsa.c 2010-07-26 22:46:35 UTC (rev 4383) +++ MacRuby/trunk/ext/openssl/ossl_pkey_rsa.c 2010-07-26 23:03:23 UTC (rev 4384) @@ -287,7 +287,8 @@ i2d_func = i2d_RSAPublicKey; if((len = i2d_func(pkey->pkey.rsa, NULL)) <= 0) ossl_raise(eRSAError, NULL); - str = rb_str_new(0, len); + str = rb_bstr_new(); + rb_bstr_resize(str, len); p = (unsigned char *)RSTRING_PTR(str); if(i2d_func(pkey->pkey.rsa, &p) < 0) ossl_raise(eRSAError, NULL); @@ -314,7 +315,8 @@ rb_scan_args(argc, argv, "11", &buffer, &padding); pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding); StringValue(buffer); - str = rb_str_new(0, ossl_rsa_buf_size(pkey)); + str = rb_bstr_new(); + rb_bstr_resize(str, ossl_rsa_buf_size(pkey)); buf_len = RSA_public_encrypt(RSTRING_LEN(buffer), (unsigned char *)RSTRING_PTR(buffer), (unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa, pad); @@ -340,7 +342,8 @@ rb_scan_args(argc, argv, "11", &buffer, &padding); pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding); StringValue(buffer); - str = rb_str_new(0, ossl_rsa_buf_size(pkey)); + str = rb_bstr_new(); + rb_bstr_resize(str, ossl_rsa_buf_size(pkey)); buf_len = RSA_public_decrypt(RSTRING_LEN(buffer), (unsigned char *)RSTRING_PTR(buffer), (unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa, pad); @@ -369,7 +372,8 @@ rb_scan_args(argc, argv, "11", &buffer, &padding); pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding); StringValue(buffer); - str = rb_str_new(0, ossl_rsa_buf_size(pkey)); + str = rb_bstr_new(); + rb_bstr_resize(str, ossl_rsa_buf_size(pkey)); buf_len = RSA_private_encrypt(RSTRING_LEN(buffer), (unsigned char *)RSTRING_PTR(buffer), (unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa, pad); @@ -399,7 +403,8 @@ rb_scan_args(argc, argv, "11", &buffer, &padding); pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding); StringValue(buffer); - str = rb_str_new(0, ossl_rsa_buf_size(pkey)); + str = rb_bstr_new(); + rb_bstr_resize(str, ossl_rsa_buf_size(pkey)); buf_len = RSA_private_decrypt(RSTRING_LEN(buffer), (unsigned char *)RSTRING_PTR(buffer), (unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa, pad);

1 0

[4383] MacRuby/trunk/bridgesupport.cpp
by source_changes＠macosforge.org 26 Jul '10

26 Jul '10

Revision: 4383 http://trac.macosforge.org/projects/ruby/changeset/4383 Author: lsansonetti(a)apple.com Date: 2010-07-26 15:46:35 -0700 (Mon, 26 Jul 2010) Log Message: ----------- remove unnecessary warnings when registering BridgeSupport types because they are triggered by false positives (<rdar://problem/8163942>) Modified Paths: -------------- MacRuby/trunk/bridgesupport.cpp Modified: MacRuby/trunk/bridgesupport.cpp =================================================================== --- MacRuby/trunk/bridgesupport.cpp 2010-07-25 03:19:02 UTC (rev 4382) +++ MacRuby/trunk/bridgesupport.cpp 2010-07-26 22:46:35 UTC (rev 4383) @@ -1012,9 +1012,6 @@ CFDictionarySetValue(rb_cObject_dict, (const void *)name, (const void *)val); } - else { - rb_warning("bs: enum `%s' already defined", rb_id2name(name)); - } break; } @@ -1030,10 +1027,6 @@ (const void *)bs_const_magic_cookie); do_not_free = true; } - else { - rb_warning("bs: constant `%s' already defined", - rb_id2name(name)); - } break; } @@ -1049,10 +1042,6 @@ CFDictionarySetValue(rb_cObject_dict, (const void *)name, (const void *)val); } - else { - rb_warning("bs: string constant `%s' already defined", - rb_id2name(name)); - } break; } @@ -1067,9 +1056,6 @@ bs_funcs[name] = bs_func; do_not_free = true; } - else { - rb_warning("bs: function `%s' already defined", bs_func->name); - } break; } @@ -1101,10 +1087,6 @@ if (register_bs_boxed(type, value)) { do_not_free = true; } - else { - rb_warning("bs: boxed `%s' already defined", - ((bs_element_opaque_t *)value)->name); - } break; } @@ -1198,10 +1180,6 @@ } do_not_free = true; } - else { - rb_warning("bs: CF type `%s' already defined", - bs_cftype->type); - } break; } }

1 0

[4382] ControlTower/trunk/sample/sinatra_hello.ru
by source_changes＠macosforge.org 25 Jul '10

25 Jul '10

Revision: 4382 http://trac.macosforge.org/projects/ruby/changeset/4382 Author: lsansonetti(a)apple.com Date: 2010-07-24 20:19:02 -0700 (Sat, 24 Jul 2010) Log Message: ----------- added sinatra hello world Added Paths: ----------- ControlTower/trunk/sample/sinatra_hello.ru Added: ControlTower/trunk/sample/sinatra_hello.ru =================================================================== --- ControlTower/trunk/sample/sinatra_hello.ru (rev 0) +++ ControlTower/trunk/sample/sinatra_hello.ru 2010-07-25 03:19:02 UTC (rev 4382) @@ -0,0 +1,10 @@ +require 'rubygems' +require 'sinatra/base' + +class MyApp < Sinatra::Base + get '/' do + 'Hello world!' + end +end + +run MyApp.new

1 0

[4381] MacRuby/trunk
by source_changes＠macosforge.org 25 Jul '10

25 Jul '10

Revision: 4381 http://trac.macosforge.org/projects/ruby/changeset/4381 Author: lsansonetti(a)apple.com Date: 2010-07-24 20:14:06 -0700 (Sat, 24 Jul 2010) Log Message: ----------- a better fix for ignored selectors, which handle the case where they are unique pointers Modified Paths: -------------- MacRuby/trunk/compiler.cpp MacRuby/trunk/objc.h MacRuby/trunk/objc.m MacRuby/trunk/vm.cpp MacRuby/trunk/vm.h Modified: MacRuby/trunk/compiler.cpp =================================================================== --- MacRuby/trunk/compiler.cpp 2010-07-25 00:55:44 UTC (rev 4380) +++ MacRuby/trunk/compiler.cpp 2010-07-25 03:14:06 UTC (rev 4381) @@ -323,13 +323,17 @@ { SEL sel; const char *mid_str = rb_id2name(mid); + char buf[100]; if (mid_str[strlen(mid_str) - 1] != ':' && arity > 0) { - char buf[100]; snprintf(buf, sizeof buf, "%s:", mid_str); sel = sel_registerName(buf); } else { sel = sel_registerName(mid_str); + if (rb_objc_ignored_sel(sel)) { + snprintf(buf, sizeof buf, "__hidden__%s", mid_str); + sel = sel_registerName(buf); + } } return sel; } @@ -2257,7 +2261,6 @@ return NULL; } SEL new_sel = mid_to_sel(SYM2ID(sym), argc - 1); - new_sel = rb_objc_ignored_sel(new_sel); GlobalVariable *is_redefined = GET_CORE()->redefined_op_gvar(sel, true); @@ -2975,7 +2978,6 @@ SEL sel; if (mid != 0) { sel = mid_to_sel(mid, positive_arity ? 1 : 0); - sel = rb_objc_ignored_sel(sel); sel_val = compile_sel(sel); if (block_declaration && super_call) { // A super call inside a block. The selector cannot Modified: MacRuby/trunk/objc.h =================================================================== --- MacRuby/trunk/objc.h 2010-07-25 00:55:44 UTC (rev 4380) +++ MacRuby/trunk/objc.h 2010-07-25 03:14:06 UTC (rev 4381) @@ -216,7 +216,7 @@ void rb_objc_exception_raise(const char *name, const char *message); -SEL rb_objc_ignored_sel(SEL sel); +bool rb_objc_ignored_sel(SEL sel); bool rb_objc_isEqual(VALUE x, VALUE y); void rb_objc_force_class_initialize(Class klass); void rb_objc_fix_relocatable_load_path(void); Modified: MacRuby/trunk/objc.m =================================================================== --- MacRuby/trunk/objc.m 2010-07-25 00:55:44 UTC (rev 4380) +++ MacRuby/trunk/objc.m 2010-07-25 03:14:06 UTC (rev 4381) @@ -639,25 +639,14 @@ return (VALUE)obj; } -SEL +bool rb_objc_ignored_sel(SEL sel) { - if (sel == @selector(retain)) { - return @selector(__hidden__retain); - } - if (sel == @selector(release)) { - return @selector(__hidden__release); - } - if (sel == @selector(autorelease)) { - return @selector(__hidden__autorelease); - } - if (sel == @selector(retainCount)) { - return @selector(__hidden__retainCount); - } - if (sel == @selector(dealloc)) { - return @selector(__hidden__dealloc); - } - return sel; + return sel == @selector(retain) + || sel == @selector(release) + || sel == @selector(autorelease) + || sel == @selector(retainCount) + || sel == @selector(dealloc); } bool Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2010-07-25 00:55:44 UTC (rev 4380) +++ MacRuby/trunk/vm.cpp 2010-07-25 03:14:06 UTC (rev 4381) @@ -1996,7 +1996,9 @@ flags |= VM_METHOD_PROTECTED; } - sel = rb_objc_ignored_sel(sel); + if (rb_objc_ignored_sel(sel)) { + return; + } const char *sel_name = sel_getName(sel); const bool genuine_selector = sel_name[strlen(sel_name) - 1] == ':'; @@ -2149,7 +2151,7 @@ static void push_method(VALUE ary, SEL sel, int flags, int (*filter) (VALUE, ID, VALUE)) { - if (rb_objc_ignored_sel(sel) != sel) { + if (rb_objc_ignored_sel(sel)) { return; } @@ -2485,7 +2487,9 @@ { assert(klass != NULL); - sel = rb_objc_ignored_sel(sel); + if (rb_objc_ignored_sel(sel)) { + return NULL; + } const char *sel_name = sel_getName(sel); const bool genuine_selector = sel_name[strlen(sel_name) - 1] == ':'; Modified: MacRuby/trunk/vm.h =================================================================== --- MacRuby/trunk/vm.h 2010-07-25 00:55:44 UTC (rev 4380) +++ MacRuby/trunk/vm.h 2010-07-25 03:14:06 UTC (rev 4381) @@ -596,12 +596,9 @@ argc, argv); } -SEL rb_objc_ignored_sel(SEL); - static inline VALUE rb_vm_call(VALUE self, SEL sel, int argc, const VALUE *argv) { - sel = rb_objc_ignored_sel(sel); return rb_vm_call0(rb_vm_current_vm(), 0, self, (Class)CLASS_OF(self), sel, NULL, DISPATCH_FCALL, argc, argv); } @@ -609,7 +606,6 @@ static inline VALUE rb_vm_call_super(VALUE self, SEL sel, int argc, const VALUE *argv) { - sel = rb_objc_ignored_sel(sel); return rb_vm_call0(rb_vm_current_vm(), 0, self, (Class)CLASS_OF(self), sel, NULL, DISPATCH_SUPER, argc, argv); } @@ -621,7 +617,6 @@ if (klass == 0) { klass = CLASS_OF(self); } - sel = rb_objc_ignored_sel(sel); return rb_vm_call0(rb_vm_current_vm(), 0, self, (Class)klass, sel, block, DISPATCH_FCALL, argc, argv); }

1 0

[4380] MacRuby/trunk/include/ruby
by source_changes＠macosforge.org 25 Jul '10

25 Jul '10

Revision: 4380 http://trac.macosforge.org/projects/ruby/changeset/4380 Author: lsansonetti(a)apple.com Date: 2010-07-24 17:55:44 -0700 (Sat, 24 Jul 2010) Log Message: ----------- some MRI compat fixes to make nokogiri build/load Modified Paths: -------------- MacRuby/trunk/include/ruby/defines.h MacRuby/trunk/include/ruby/encoding.h Modified: MacRuby/trunk/include/ruby/defines.h =================================================================== --- MacRuby/trunk/include/ruby/defines.h 2010-07-24 18:58:05 UTC (rev 4379) +++ MacRuby/trunk/include/ruby/defines.h 2010-07-25 00:55:44 UTC (rev 4380) @@ -294,6 +294,11 @@ #define HAVE_RUBY_VM_H #endif +#ifndef HAVE_RUBY_ENCODING_H +// Some C extensions use that variable to determine if they build against 1.9. +#define HAVE_RUBY_ENCODING_H +#endif + #define force_inline __attribute__((always_inline)) #if defined(__cplusplus) Modified: MacRuby/trunk/include/ruby/encoding.h =================================================================== --- MacRuby/trunk/include/ruby/encoding.h 2010-07-24 18:58:05 UTC (rev 4379) +++ MacRuby/trunk/include/ruby/encoding.h 2010-07-25 00:55:44 UTC (rev 4380) @@ -40,7 +40,6 @@ VALUE rb_enc_vsprintf(rb_encoding *, const char*, va_list); long rb_enc_strlen(const char*, const char*, rb_encoding*); char* rb_enc_nth(const char*, const char*, int, rb_encoding*); -VALUE rb_obj_encoding(VALUE, SEL); VALUE rb_enc_str_buf_cat(VALUE str, const char *ptr, long len, rb_encoding *enc); /* index -> rb_encoding */ @@ -137,6 +136,9 @@ VALUE rb_str_transcode(VALUE str, VALUE to); +// MRI compat. +#define rb_external_str_new_with_enc rb_enc_str_new + #if defined(__cplusplus) } #endif

1 0

[4379] MacRuby/trunk/dispatcher.cpp
by source_changes＠macosforge.org 24 Jul '10

24 Jul '10

Revision: 4379 http://trac.macosforge.org/projects/ruby/changeset/4379 Author: lsansonetti(a)apple.com Date: 2010-07-24 11:58:05 -0700 (Sat, 24 Jul 2010) Log Message: ----------- fix a crash when yielding a block inside a loop in a thread (#620, patch contributed by watson1978 at gmail.com) Modified Paths: -------------- MacRuby/trunk/dispatcher.cpp Modified: MacRuby/trunk/dispatcher.cpp =================================================================== --- MacRuby/trunk/dispatcher.cpp 2010-07-24 15:44:15 UTC (rev 4378) +++ MacRuby/trunk/dispatcher.cpp 2010-07-24 18:58:05 UTC (rev 4379) @@ -1210,7 +1210,9 @@ } ~Finally() { vm->add_current_block(b); - b->flags &= ~VM_BLOCK_THREAD; + if (vm == RoxorVM::main) { + b->flags &= ~VM_BLOCK_THREAD; + } } } finalizer(vm, b); @@ -1338,7 +1340,7 @@ } else { assert(b->dvars_size == dvars_size); - assert((b->flags & flags) == (flags & ~VM_BLOCK_THREAD)); + assert((b->flags & flags) == flags); } b->proc = Qnil;

1 0

[4378] MacRuby/trunk
by source_changes＠macosforge.org 24 Jul '10

24 Jul '10

Revision: 4378 http://trac.macosforge.org/projects/ruby/changeset/4378 Author: eloy.de.enige(a)gmail.com Date: 2010-07-24 08:44:15 -0700 (Sat, 24 Jul 2010) Log Message: ----------- Add irb to macruby.mspec. But not to :full yet, it messes up some of the other specs. Modified Paths: -------------- MacRuby/trunk/rakelib/spec.rake MacRuby/trunk/spec/macruby.mspec Modified: MacRuby/trunk/rakelib/spec.rake =================================================================== --- MacRuby/trunk/rakelib/spec.rake 2010-07-24 15:44:04 UTC (rev 4377) +++ MacRuby/trunk/rakelib/spec.rake 2010-07-24 15:44:15 UTC (rev 4378) @@ -46,7 +46,7 @@ desc "Run the DietRB specs" task :irb do - mspec :ci, "./spec/dietrb" + mspec :ci, ":irb" end desc "Run language examples that are known to fail" Modified: MacRuby/trunk/spec/macruby.mspec =================================================================== --- MacRuby/trunk/spec/macruby.mspec 2010-07-24 15:44:04 UTC (rev 4377) +++ MacRuby/trunk/spec/macruby.mspec 2010-07-24 15:44:15 UTC (rev 4378) @@ -52,6 +52,7 @@ end set :macruby, ['spec/macruby'] + set :irb, ['spec/dietrb'] set :rubyspec, get(:command_line) + get(:language) + get(:core) + get(:library) set :full, get(:macruby) + get(:rubyspec)

1 0

[4377] MacRuby/trunk/spec
by source_changes＠macosforge.org 24 Jul '10

24 Jul '10

Revision: 4377 http://trac.macosforge.org/projects/ruby/changeset/4377 Author: eloy.de.enige(a)gmail.com Date: 2010-07-24 08:44:04 -0700 (Sat, 24 Jul 2010) Log Message: ----------- Tag failing irb specs Modified Paths: -------------- MacRuby/trunk/spec/macruby.mspec Added Paths: ----------- MacRuby/trunk/spec/dietrb/tags/ MacRuby/trunk/spec/dietrb/tags/context_tags.txt MacRuby/trunk/spec/dietrb/tags/ext/ MacRuby/trunk/spec/dietrb/tags/ext/completion_tags.txt MacRuby/trunk/spec/dietrb/tags/formatter_tags.txt Added: MacRuby/trunk/spec/dietrb/tags/context_tags.txt =================================================================== --- MacRuby/trunk/spec/dietrb/tags/context_tags.txt (rev 0) +++ MacRuby/trunk/spec/dietrb/tags/context_tags.txt 2010-07-24 15:44:04 UTC (rev 4377) @@ -0,0 +1 @@ +fails:IRB::Context, when evaluating source uses the line number of the *first* line in the buffer, for the line parameter of eval Added: MacRuby/trunk/spec/dietrb/tags/ext/completion_tags.txt =================================================================== --- MacRuby/trunk/spec/dietrb/tags/ext/completion_tags.txt (rev 0) +++ MacRuby/trunk/spec/dietrb/tags/ext/completion_tags.txt 2010-07-24 15:44:04 UTC (rev 4377) @@ -0,0 +1,5 @@ +fails:IRB::Completion when *not* doing a method call on an explicit receiver matches local variables and instance method of the context object +fails:IRB::Completion when *not* doing a method call on an explicit receiver matches local variables +fails:IRB::Completion when doing a method call on an explicit receiver, and the source does *not* end with a period, filters the methods, of the variable receiver, by the given method name +fails:IRB::Completion when doing a method call on an explicit receiver, and the source ends with a period, returns *all* public instance methods of the class (the receiver) that matches as a lambda literal +fails:IRB::Completion when doing a method call on an explicit receiver, and the source ends with a period, returns *all* public methods of the receiver that matches as a local variable Added: MacRuby/trunk/spec/dietrb/tags/formatter_tags.txt =================================================================== --- MacRuby/trunk/spec/dietrb/tags/formatter_tags.txt (rev 0) +++ MacRuby/trunk/spec/dietrb/tags/formatter_tags.txt 2010-07-24 15:44:04 UTC (rev 4377) @@ -0,0 +1,2 @@ +fails:IRB::Formatter does not filter the backtrace if $DEBUG is true +fails:IRB::Formatter returns a formatted exception message, with the lines, regarding dietrb, filtered out of the backtrace Modified: MacRuby/trunk/spec/macruby.mspec =================================================================== --- MacRuby/trunk/spec/macruby.mspec 2010-07-24 15:11:24 UTC (rev 4376) +++ MacRuby/trunk/spec/macruby.mspec 2010-07-24 15:44:04 UTC (rev 4377) @@ -81,6 +81,7 @@ [%r(language/), 'tags/macruby/language/'], [%r(core/), 'tags/macruby/core/'], [%r(library/), 'tags/macruby/library/'], + [%r(dietrb/), 'dietrb/tags/'], [/_spec.rb$/, '_tags.txt'] ] end

1 0