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

[3140] MacRuby/trunk
by source_changes＠macosforge.org 21 Dec '09

21 Dec '09

Revision: 3140 http://trac.macosforge.org/projects/ruby/changeset/3140 Author: joshua.ballanco(a)apple.com Date: 2009-12-21 04:34:46 -0800 (Mon, 21 Dec 2009) Log Message: ----------- Enable aliasing of Objective-C methods Modified Paths: -------------- MacRuby/trunk/spec/macruby/core/array_spec.rb MacRuby/trunk/spec/macruby/core/hash_spec.rb MacRuby/trunk/spec/macruby/core/string_spec.rb MacRuby/trunk/spec/macruby/language/objc_method_spec.rb MacRuby/trunk/vm.cpp MacRuby/trunk/vm.h Modified: MacRuby/trunk/spec/macruby/core/array_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/array_spec.rb 2009-12-19 01:50:51 UTC (rev 3139) +++ MacRuby/trunk/spec/macruby/core/array_spec.rb 2009-12-21 12:34:46 UTC (rev 3140) @@ -79,3 +79,49 @@ end =end end + +describe "Objective-C Array methods" do + before :each do + @a = [1,2,3,4] + end + + it "should be able to be aliased to other selectors" do + class << @a + alias :foo :count + end + + @a.foo.should == @a.count + end + + it "should be able to be aliased by pure Ruby methods" do + class << @a + def foo + return 42 + end + alias :count :foo + end + + @a.count.should == 42 + end + + it "should be commutative when aliased" do + class << @a + def foo + return 42 + end + def do_alias + alias :old_count :count + alias :count :foo + end + def undo_alias + alias :count :old_count + end + end + + @a.count.should == 4 + @a.do_alias + @a.count.should == 42 + @a.undo_alias + @a.count.should == 4 + end +end Modified: MacRuby/trunk/spec/macruby/core/hash_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/hash_spec.rb 2009-12-19 01:50:51 UTC (rev 3139) +++ MacRuby/trunk/spec/macruby/core/hash_spec.rb 2009-12-21 12:34:46 UTC (rev 3140) @@ -77,3 +77,49 @@ lambda { a[42] = 123 }.should raise_error(RuntimeError) end end + +describe "Objective-C Hash methods" do + before :each do + @a = {:a => 1, :b => 2, :c => 3} + end + + it "should be able to be aliased to other selectors" do + class << @a + alias :foo :count + end + + @a.foo.should == @a.count + end + + it "should be able to be aliased by pure Ruby methods" do + class << @a + def foo + return 42 + end + alias :count :foo + end + + @a.count.should == 42 + end + + it "should be commutative when aliased" do + class << @a + def foo + return 42 + end + def do_alias + alias :old_count :count + alias :count :foo + end + def undo_alias + alias :count :old_count + end + end + + @a.count.should == 4 + @a.do_alias + @a.count.should == 42 + @a.undo_alias + @a.count.should == 4 + end +end Modified: MacRuby/trunk/spec/macruby/core/string_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/string_spec.rb 2009-12-19 01:50:51 UTC (rev 3139) +++ MacRuby/trunk/spec/macruby/core/string_spec.rb 2009-12-21 12:34:46 UTC (rev 3140) @@ -81,3 +81,49 @@ #lambda { a << 'foo' }.should raise_error(RuntimeError) end end + +describe "Objective-C String methods" do + before :each do + @a = "test" + end + + it "should be able to be aliased to other selectors" do + class << @a + alias :foo :length + end + + @a.foo.should == @a.length + end + + it "should be able to be aliased by pure Ruby methods" do + class << @a + def foo + return 42 + end + alias :length :foo + end + + @a.length.should == 42 + end + + it "should be commutative when aliased" do + class << @a + def foo + return 42 + end + def do_alias + alias :old_length :length + alias :length :foo + end + def undo_alias + alias :length :old_length + end + end + + @a.length.should == 4 + @a.do_alias + @a.length.should == 42 + @a.undo_alias + @a.length.should == 4 + end +end Modified: MacRuby/trunk/spec/macruby/language/objc_method_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/language/objc_method_spec.rb 2009-12-19 01:50:51 UTC (rev 3139) +++ MacRuby/trunk/spec/macruby/language/objc_method_spec.rb 2009-12-21 12:34:46 UTC (rev 3140) @@ -408,6 +408,49 @@ end @o.methodAcceptingSEL('foo:arg1:arg2:', target:o) end + + it "can have another method aliased to it" do + class << @o + alias :test_method :methodReturningSelf + end + + @o.should.respond_to(:test_method) + @o.test_method.should == @o + @o.test_method.object_id.should == @o.object_id + end + + it "can be aliased to a pure Ruby method" do + class << @o + def foo + return 42 + end + alias :methodReturningSelf :foo + end + + @o.should.respond_to(:methodReturningSelf) + @o.methodReturningSelf.should == 42 + end + + it "should be commutative when aliased" do + class << @o + def foo + return 42 + end + def do_alias + alias :old_methodReturningSelf :methodReturningSelf + alias :methodReturningSelf :foo + end + def undo_alias + alias :methodReturningSelf :old_methodReturningSelf + end + end + + @o.methodReturningSelf.should == @o + @o.do_alias + @o.methodReturningSelf.should == 42 + @o.undo_alias + @o.methodReturningSelf.should == @o + end end describe "A pure MacRuby method" do Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2009-12-19 01:50:51 UTC (rev 3139) +++ MacRuby/trunk/vm.cpp 2009-12-21 12:34:46 UTC (rev 3140) @@ -1464,11 +1464,6 @@ const char *types = method_getTypeEncoding(method); rb_vm_method_node_t *node = GET_CORE()->method_node_get(method); - if (node == NULL) { - rb_raise(rb_eArgError, - "only pure Ruby methods can be aliased (`%s' is not)", - sel_getName(method_getName(method))); - } const char *name_str = rb_id2name(name); SEL sel; @@ -1481,8 +1476,27 @@ sel = sel_registerName(tmp); } - GET_CORE()->add_method(klass, sel, imp, node->ruby_imp, - node->arity, node->flags, types); + if (node == NULL) { + Method method_to_replace = class_getInstanceMethod(klass, sel); + rb_vm_method_node_t *node_to_replace = GET_CORE()->method_node_get(method_to_replace); + if ((klass == (Class)rb_cCFString || klass == (Class)rb_cCFHash) + && node_to_replace != NULL) { + //Doesn't work: + //GET_CORE()->remove_method(klass, sel); + // + //This, apparently, doesn't work either... + //GET_CORE()->add_method(klass, sel, imp, imp, + // arity, 0, types); + // + //This...sorta...works... + GET_CORE()->nuke_method(method_to_replace); + } + class_replaceMethod(klass, sel, imp, types); + } + else { + GET_CORE()->add_method(klass, sel, imp, node->ruby_imp, + node->arity, node->flags, types); + } } extern "C" @@ -1503,6 +1517,15 @@ const char *def_str = rb_id2name(def); SEL sel = sel_registerName(def_str); + + // String and Hash aliases should be defined on the Core Foundation classes + if (klass == (Class)rb_cNSMutableString) { + klass = (Class)rb_cCFString; + } + if (klass == (Class)rb_cNSMutableHash) { + klass = (Class)rb_cCFHash; + } + Method def_method1 = class_getInstanceMethod(klass, sel); Method def_method2 = NULL; if (def_str[strlen(def_str) - 1] != ':') { @@ -2535,6 +2558,16 @@ } } +void +RoxorCore::nuke_method(Method m) +{ + invalidate_method_cache(method_getName(m)); + std::map<Method, rb_vm_method_node_t *>::iterator iter = ruby_methods.find(m); + assert(iter != ruby_methods.end()); + free(iter->second); + ruby_methods.erase(iter); +} + extern "C" void rb_vm_undef_method(Class klass, ID name, bool must_exist) Modified: MacRuby/trunk/vm.h =================================================================== --- MacRuby/trunk/vm.h 2009-12-19 01:50:51 UTC (rev 3139) +++ MacRuby/trunk/vm.h 2009-12-21 12:34:46 UTC (rev 3140) @@ -757,6 +757,7 @@ rb_vm_method_node_t *node, const char *types); void undef_method(Class klass, SEL sel); void remove_method(Class klass, SEL sel); + void nuke_method(Method m); bool resolve_methods(std::map<Class, rb_vm_method_source_t *> *map, Class klass, SEL sel); bool copy_method(Class klass, Method m);

1 0

[3139] MacRuby/trunk
by source_changes＠macosforge.org 19 Dec '09

19 Dec '09

Revision: 3139 http://trac.macosforge.org/projects/ruby/changeset/3139 Author: ernest.prabhakar(a)gmail.com Date: 2009-12-18 17:50:51 -0800 (Fri, 18 Dec 2009) Log Message: ----------- Changed QueueDispatch::Queue after to use new time macros/functions Modified Paths: -------------- MacRuby/trunk/gcd.c MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/queue_tags.txt Modified: MacRuby/trunk/gcd.c =================================================================== --- MacRuby/trunk/gcd.c 2009-12-19 01:49:41 UTC (rev 3138) +++ MacRuby/trunk/gcd.c 2009-12-19 01:50:51 UTC (rev 3139) @@ -135,8 +135,8 @@ } } -#define SEC2NSEC_UINT64(sec) (uint64_t)((sec) * NSEC_PER_SEC) -#define SEC2NSEC_INT64(sec) (int64_t)((sec) * NSEC_PER_SEC) +#define SEC2NSEC_UINT64(sec) (uint64_t)(sec * NSEC_PER_SEC) +#define SEC2NSEC_INT64(sec) (int64_t)(sec * NSEC_PER_SEC) #define TIMEOUT_MAX (1.0 * INT64_MAX / NSEC_PER_SEC) static inline uint64_t @@ -432,15 +432,10 @@ * gcdq.after(0.5) { puts 'wait is over :)' } * */ -// TODO: there is a max value that can be passed (int64_max / NSEC_PER_SEC); -// adjust for this. static VALUE rb_queue_dispatch_after(VALUE self, SEL sel, VALUE sec) { - sec = rb_Float(sec); - dispatch_time_t offset = dispatch_walltime(NULL, - (int64_t)(RFLOAT_VALUE(sec) * NSEC_PER_SEC)); - + dispatch_time_t offset = rb_num2timeout(sec); rb_vm_block_t *block = given_block(); block = rb_dispatch_prepare_block(block); Modified: MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/queue_tags.txt =================================================================== --- MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/queue_tags.txt 2009-12-19 01:49:41 UTC (rev 3138) +++ MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/queue_tags.txt 2009-12-19 01:50:51 UTC (rev 3139) @@ -1,2 +1,3 @@ critical:Dispatch::Queue new raises an ArgumentError if not passed a string +critical:Dispatch::Queue after raises an ArgumentError if no time is given

1 0

[3138] MacRuby/trunk/rubyc.1
by source_changes＠macosforge.org 19 Dec '09

19 Dec '09

Revision: 3138 http://trac.macosforge.org/projects/ruby/changeset/3138 Author: ernest.prabhakar(a)gmail.com Date: 2009-12-18 17:49:41 -0800 (Fri, 18 Dec 2009) Log Message: ----------- Typo in rubyc man page Modified Paths: -------------- MacRuby/trunk/rubyc.1 Modified: MacRuby/trunk/rubyc.1 =================================================================== --- MacRuby/trunk/rubyc.1 2009-12-19 01:16:23 UTC (rev 3137) +++ MacRuby/trunk/rubyc.1 2009-12-19 01:49:41 UTC (rev 3138) @@ -111,7 +111,7 @@ .Nm ruby_deploy (via the Xcode target) when deploying Cocoa applications. However, calling .Nm rubyc -provides greater control, and allows you to create libraries, and standalone executables. +provides greater control, and allows you to create libraries and standalone executables. .Pp The easiest way to compile an existing project is to generate loadable object bundles for every Ruby source file, e.g., using the .Fl C

1 0

[3137] MacRuby/trunk/rubyc.1
by source_changes＠macosforge.org 19 Dec '09

19 Dec '09

Revision: 3137 http://trac.macosforge.org/projects/ruby/changeset/3137 Author: ernest.prabhakar(a)gmail.com Date: 2009-12-18 17:16:23 -0800 (Fri, 18 Dec 2009) Log Message: ----------- Updated man page for rubyc to remove gems reference Modified Paths: -------------- MacRuby/trunk/rubyc.1 Modified: MacRuby/trunk/rubyc.1 =================================================================== --- MacRuby/trunk/rubyc.1 2009-12-19 01:12:49 UTC (rev 3136) +++ MacRuby/trunk/rubyc.1 2009-12-19 01:16:23 UTC (rev 3137) @@ -111,7 +111,7 @@ .Nm ruby_deploy (via the Xcode target) when deploying Cocoa applications. However, calling .Nm rubyc -provides greater control, and allows you to create MacRuby gems, libraries, and standalone executables. +provides greater control, and allows you to create libraries, and standalone executables. .Pp The easiest way to compile an existing project is to generate loadable object bundles for every Ruby source file, e.g., using the .Fl C

1 0

[3136] MacRuby/trunk/rubyc.1
by source_changes＠macosforge.org 19 Dec '09

19 Dec '09

Revision: 3136 http://trac.macosforge.org/projects/ruby/changeset/3136 Author: ernest.prabhakar(a)gmail.com Date: 2009-12-18 17:12:49 -0800 (Fri, 18 Dec 2009) Log Message: ----------- Updated man page for rubyc Modified Paths: -------------- MacRuby/trunk/rubyc.1 Modified: MacRuby/trunk/rubyc.1 =================================================================== --- MacRuby/trunk/rubyc.1 2009-12-19 00:28:48 UTC (rev 3135) +++ MacRuby/trunk/rubyc.1 2009-12-19 01:12:49 UTC (rev 3136) @@ -10,7 +10,9 @@ .Ar files... .Sh DESCRIPTION .Nm rubyc -is a command-line interface to the MacRuby Ahead-of-Time (AOT) compiler. It statically compiles Ruby source code into native machine code (object files), and can then link it (dynamically or statically) into executables or dynamic libraries. +is a command-line interface to the MacRuby Ahead-of-Time (AOT) compiler. It statically compiles Ruby source code into native machine code (object files), and can then link it (dynamically or statically) into executables or dynamic libraries. It is typically invoked from +.Nm ruby_deploy +rather than being called directly. .Pp The Ahead-of-Time compilation process has two major advantages. The Ruby code does not need to be parsed and compiled at runtime, which improves the startup time of the program, and the original Ruby source code is no longer available, as it has been compiled down to machine code. .Sh OPTIONS @@ -70,13 +72,7 @@ .Nm rubyc . This option is generally used for internal debugging. .El -.Sh USAGE -The easiest way to compile an existing project is probably to generate loadable object bundles for every Ruby source file, using the -.Fl C -option. These bundles have the .rbo file extension and can be installed in the same directory as the original .rb source files. The MacRuby runtime will always pick .rbo files over .rb files upon #require calls. The source files can be removed later. -.Pp -.Dl $ find src/lib -name """*.rb""" -exec rubyc -C {} \e; -.Pp +.Sh EXAMPLES When used without options, .Nm rubyc will create a binary executable, like the C compiler. @@ -106,6 +102,25 @@ .Dl $ rubyc test.rb code.dylib -o test .Dl $ ./test .Pp +.Sh USAGE +Generally, you should use +.Nm ruby +and +.Nm irb +during development, and +.Nm ruby_deploy +(via the Xcode target) when deploying Cocoa applications. However, calling +.Nm rubyc +provides greater control, and allows you to create MacRuby gems, libraries, and standalone executables. +.Pp +The easiest way to compile an existing project is to generate loadable object bundles for every Ruby source file, e.g., using the +.Fl C +option and the find command: +.Pp +.Dl $ find ./lib -name """*.rb""" -exec rubyc -C {} \e; +.Pp +This creates bundles with the .rbo file extension in the same directory as the original .rb source files. The MacRuby runtime will always pick .rbo files over .rb files upon #require calls. The source files can then be removed. +.Pp .Sh SEE ALSO .Xr ruby 1 , .Xr irb 1 ,

1 0

[3135] MacRuby/trunk/spec/macruby/core/gcd
by source_changes＠macosforge.org 19 Dec '09

19 Dec '09

Revision: 3135 http://trac.macosforge.org/projects/ruby/changeset/3135 Author: lsansonetti(a)apple.com Date: 2009-12-18 16:28:48 -0800 (Fri, 18 Dec 2009) Log Message: ----------- re-enable the gcd/semaphore specs Added Paths: ----------- MacRuby/trunk/spec/macruby/core/gcd/semaphore_spec.rb Removed Paths: ------------- MacRuby/trunk/spec/macruby/core/gcd/semaphore_spec_disabled.rb Copied: MacRuby/trunk/spec/macruby/core/gcd/semaphore_spec.rb (from rev 3131, MacRuby/trunk/spec/macruby/core/gcd/semaphore_spec_disabled.rb) =================================================================== --- MacRuby/trunk/spec/macruby/core/gcd/semaphore_spec.rb (rev 0) +++ MacRuby/trunk/spec/macruby/core/gcd/semaphore_spec.rb 2009-12-19 00:28:48 UTC (rev 3135) @@ -0,0 +1,70 @@ +# XXX disabled because of <rdar://problem/7472121> dispatch_release() crashes on a semaphore after a successful wait + +require File.dirname(__FILE__) + "/../../spec_helper" + +if MACOSX_VERSION >= 10.6 + + describe "Dispatch::Semaphore" do + before :each do + @sema0 = Dispatch::Semaphore.new 0 + @sema1 = Dispatch::Semaphore.new 1 + @q = Dispatch::Queue.new('org.macruby.gcd_spec.semaphore') + end + + it "returns an instance of Semaphore for non-negative counts" do + @sema0.should be_kind_of(Dispatch::Semaphore) + @sema1.should be_kind_of(Dispatch::Semaphore) + end + + it "raises an ArgumentError if the count isn't specified" do + lambda { Dispatch::Semaphore.new }.should raise_error(ArgumentError) + end + + it "raises a TypeError if a non-numeric count is provided" do + lambda { Dispatch::Semaphore.new :foo }.should raise_error(TypeError) + lambda { Dispatch::Semaphore.new 3.5 }.should_not raise_error(TypeError) + lambda { Dispatch::Semaphore.new "3" }.should raise_error(TypeError) + end + + it "raises an ArgumentError if the specified count is less than zero" do + lambda { Dispatch::Semaphore.new -1 }.should raise_error(ArgumentError) + end + + describe :wait do + it "always returns true with default timeout FOREVER" do + @sema1.wait.should == true + end + + it "returns false if explicit timeout DOES expire" do + @sema0.wait(0.01).should == false + @sema1.wait(0.01).should == false + end + + it "returns true if explicit timeout does NOT expire" do + @sema1.wait(Dispatch::TIME_FOREVER).should == true + q = Dispatch::Queue.new('foo') + q.async { @sema0.signal } + @sema0.wait(Dispatch::TIME_FOREVER).should == true + end + end + + describe :signal do + it "returns true if it does NOT wake a thread" do + @sema0.signal.should == true + @sema1.signal.should == true + end + + it "returns false if it DOES wake a thread" do + @q.async do + sleep 0.1 + @sema0.signal.should == false + @sema1.signal.should == true + @sema1.signal.should == false + end + @sema0.wait(Dispatch::TIME_FOREVER) + @sema1.wait(Dispatch::TIME_FOREVER) + end + end + + end +end Deleted: MacRuby/trunk/spec/macruby/core/gcd/semaphore_spec_disabled.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/gcd/semaphore_spec_disabled.rb 2009-12-19 00:26:22 UTC (rev 3134) +++ MacRuby/trunk/spec/macruby/core/gcd/semaphore_spec_disabled.rb 2009-12-19 00:28:48 UTC (rev 3135) @@ -1,70 +0,0 @@ -# XXX disabled because of <rdar://problem/7472121> dispatch_release() crashes on a semaphore after a successful wait - -require File.dirname(__FILE__) + "/../../spec_helper" - -if MACOSX_VERSION >= 10.6 - - describe "Dispatch::Semaphore" do - before :each do - @sema0 = Dispatch::Semaphore.new 0 - @sema1 = Dispatch::Semaphore.new 1 - @q = Dispatch::Queue.new('org.macruby.gcd_spec.semaphore') - end - - it "returns an instance of Semaphore for non-negative counts" do - @sema0.should be_kind_of(Dispatch::Semaphore) - @sema1.should be_kind_of(Dispatch::Semaphore) - end - - it "raises an ArgumentError if the count isn't specified" do - lambda { Dispatch::Semaphore.new }.should raise_error(ArgumentError) - end - - it "raises a TypeError if a non-numeric count is provided" do - lambda { Dispatch::Semaphore.new :foo }.should raise_error(TypeError) - lambda { Dispatch::Semaphore.new 3.5 }.should_not raise_error(TypeError) - lambda { Dispatch::Semaphore.new "3" }.should raise_error(TypeError) - end - - it "raises an ArgumentError if the specified count is less than zero" do - lambda { Dispatch::Semaphore.new -1 }.should raise_error(ArgumentError) - end - - describe :wait do - it "always returns true with default timeout FOREVER" do - @sema1.wait.should == true - end - - it "returns false if explicit timeout DOES expire" do - @sema0.wait(0.01).should == false - @sema1.wait(0.01).should == false - end - - it "returns true if explicit timeout does NOT expire" do - @sema1.wait(Dispatch::TIME_FOREVER).should == true - q = Dispatch::Queue.new('foo') - q.async { @sema0.signal } - @sema0.wait(Dispatch::TIME_FOREVER).should == true - end - end - - describe :signal do - it "returns true if it does NOT wake a thread" do - @sema0.signal.should == true - @sema1.signal.should == true - end - - it "returns false if it DOES wake a thread" do - @q.async do - sleep 0.1 - @sema0.signal.should == false - @sema1.signal.should == true - @sema1.signal.should == false - end - @sema0.wait(Dispatch::TIME_FOREVER) - @sema1.wait(Dispatch::TIME_FOREVER) - end - end - - end -end

1 0

[3134] MacRuby/trunk/gcd.c
by source_changes＠macosforge.org 19 Dec '09

19 Dec '09

Revision: 3134 http://trac.macosforge.org/projects/ruby/changeset/3134 Author: lsansonetti(a)apple.com Date: 2009-12-18 16:26:22 -0800 (Fri, 18 Dec 2009) Log Message: ----------- when finalizing a dispatch semaphore, re-equilibrate before release to avoid a crash Modified Paths: -------------- MacRuby/trunk/gcd.c Modified: MacRuby/trunk/gcd.c =================================================================== --- MacRuby/trunk/gcd.c 2009-12-18 22:49:41 UTC (rev 3133) +++ MacRuby/trunk/gcd.c 2009-12-19 00:26:22 UTC (rev 3134) @@ -86,6 +86,7 @@ typedef struct { struct RBasic basic; dispatch_semaphore_t sem; + long count; } rb_semaphore_t; #define RSemaphore(val) ((rb_semaphore_t*)val) @@ -838,6 +839,7 @@ NEWOBJ(s, rb_semaphore_t); OBJSETUP(s, klass, RUBY_T_NATIVE); s->sem = NULL; + s->count = 0; return (VALUE)s; } @@ -850,6 +852,7 @@ NUM2LONG(value)); } RSemaphore(self)->sem = s; + RSemaphore(self)->count = NUM2LONG(value); return self; } @@ -875,6 +878,12 @@ rb_semaphore_finalize(void *rcv, SEL sel) { if (RSemaphore(rcv)->sem != NULL) { + // We must re-equilibrate the semaphore count before releasing it, + // otherwise GCD will violently crash the program by an assertion. + 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) {

1 0

[3133] MacRuby/trunk/rubyc.1
by source_changes＠macosforge.org 18 Dec '09

18 Dec '09

Revision: 3133 http://trac.macosforge.org/projects/ruby/changeset/3133 Author: lsansonetti(a)apple.com Date: 2009-12-18 14:49:41 -0800 (Fri, 18 Dec 2009) Log Message: ----------- minor aesthetic change Modified Paths: -------------- MacRuby/trunk/rubyc.1 Modified: MacRuby/trunk/rubyc.1 =================================================================== --- MacRuby/trunk/rubyc.1 2009-12-18 22:22:08 UTC (rev 3132) +++ MacRuby/trunk/rubyc.1 2009-12-18 22:49:41 UTC (rev 3133) @@ -19,7 +19,7 @@ tool accepts the following command-line options: .Bl -tag -width "123" -compact .Pp -.It Fl a Ar arch, Fl -arch Ar arch +.It Fl a Ar arch , Fl -arch Ar arch Compile for specified CPU architecture. By default, .Nm rubyc will compile for the current architecture. This option will compile for a different architecture. When this option is provided more than once,

1 0

[3132] MacRuby/trunk/rubyc.1
by source_changes＠macosforge.org 18 Dec '09

18 Dec '09

Revision: 3132 http://trac.macosforge.org/projects/ruby/changeset/3132 Author: lsansonetti(a)apple.com Date: 2009-12-18 14:22:08 -0800 (Fri, 18 Dec 2009) Log Message: ----------- merge feedback from various people Modified Paths: -------------- MacRuby/trunk/rubyc.1 Modified: MacRuby/trunk/rubyc.1 =================================================================== --- MacRuby/trunk/rubyc.1 2009-12-18 02:23:05 UTC (rev 3131) +++ MacRuby/trunk/rubyc.1 2009-12-18 22:22:08 UTC (rev 3132) @@ -10,21 +10,21 @@ .Ar files... .Sh DESCRIPTION .Nm rubyc -is a command-line interface to the MacRuby Ahead-of-Time (AOT) compiler. It allows static compilation of Ruby source code into machine code objects, dynamic libraries or executables. +is a command-line interface to the MacRuby Ahead-of-Time (AOT) compiler. It statically compiles Ruby source code into native machine code (object files), and can then link it (dynamically or statically) into executables or dynamic libraries. .Pp -The Ahead-of-Time compilation process has two major advantages; the Ruby code does not need to be parsed and compiled at runtime, which improves the startup time of the program, and the original Ruby source code is no longer available as is since it has been compiled down to machine code. +The Ahead-of-Time compilation process has two major advantages. The Ruby code does not need to be parsed and compiled at runtime, which improves the startup time of the program, and the original Ruby source code is no longer available, as it has been compiled down to machine code. .Sh OPTIONS The .Nm rubyc tool accepts the following command-line options: .Bl -tag -width "123" -compact .Pp -.It Fl o Ar file -Place the output into -.Ar file . -If this option is not given, +.It Fl a Ar arch, Fl -arch Ar arch +Compile for specified CPU architecture. By default, .Nm rubyc -will try to determine a default output file name based on the object file type that is being generated. For executables, the default is a.out. For objects, the default is the original source file name with the object type extension. For dynamic libraries, this option is mandatory. +will compile for the current architecture. This option will compile for a different architecture. When this option is provided more than once, +.Nm rubyc +will create a universal binary. At the time of this writing, only the i386 and x86_64 architectures are supported. .Pp .It Fl c Compile and assemble, but do not link. This option produces a Mach-O object file (.o) for every Ruby source file passed to @@ -34,15 +34,10 @@ to create a dynamic library or executable. .Pp .It Fl C -Compile, assemble and link a loadable object file. This option produces a Mach-O MacRuby loadable object bundle (.rbo) for every Ruby source file passed to -.Mm rubyc , -using a default file name which consists of the source file name with the .rbo file extension. A MacRuby loadable object is a Mach-O bundle compiled with a global constructor that will evaluate the Ruby machine code once it's loaded by the dynamic linker, at runtime, generally upon a Ruby #require statement. +Compile, assemble, and link a loadable object file. This option produces a Mach-O MacRuby loadable object bundle (.rbo) for every Ruby source file passed to +.Nm rubyc , +using a default file name which consists of the source file name with the .rbo file extension. A MacRuby loadable object is a Mach-O bundle, compiled with a global constructor that will evaluate the Ruby machine code once it's loaded by the dynamic linker, at runtime, generally upon a Ruby #require statement. .Pp -.It Fl -static -Create a standalone, static executable. By default, executables created by -.Nm rubyc -are dynamically linking against the MacRuby runtime. This option will generate executables that are statically linking against the MacRuby runtime, significantly increasing the binary size but allowing its distribution on environments where MacRuby is not installed. This option can only be used when creating executables. -.Pp .It Fl -dylib Create a dynamic library instead of an executable. This option compiles every Ruby source file passed to .Nm rubyc @@ -52,12 +47,20 @@ .Fl o option must be provided when building dynamic libraries. .Pp -.It Fl a Ar arch, Fl -arch Ar arch -Compile for specified CPU architecture. By default, +.It Fl h, Fl -help +Display a short description of the command line options. +.Pp +.It Fl o Ar file +Place the output into +.Ar file . +If this option is not given, .Nm rubyc -will compile for the current CPU architecture. This option will compile for a different architecture. When this option is provided more than once, +will try to determine a default output file name based on the object file type that is being generated. For executables, the default is a.out. For objects, the default is the original source file name with the object type extension. For dynamic libraries, this option is mandatory. +.Pp +.It Fl -static +Create a standalone, static executable. By default, executables created by .Nm rubyc -will create a universal binary. At the time of this writing, only the i386 and x86_64 architectures are supported. +are dynamically linked against the MacRuby runtime. This option will generate executables that are statically linked against the MacRuby runtime, significantly increasing the binary size but allowing its distribution on environments where MacRuby is not installed. This option can only be used when creating executables. .Pp .It Fl v, Fl -version Display the version. @@ -66,25 +69,26 @@ Print every command line executed by .Nm rubyc . This option is generally used for internal debugging. -.Pp -.It Fl h, Fl -help -Display a short description of the command line options. .El -.Sh EXAMPLES +.Sh USAGE The easiest way to compile an existing project is probably to generate loadable object bundles for every Ruby source file, using the .Fl C -option. These bundles are using the .rbo file extension and can simply be installed in the same directory as the original .rb source files. The MacRuby runtime will always pick .rbo files in priority upon #require calls. The source files can later be removed. +option. These bundles have the .rbo file extension and can be installed in the same directory as the original .rb source files. The MacRuby runtime will always pick .rbo files over .rb files upon #require calls. The source files can be removed later. +.Pp .Dl $ find src/lib -name """*.rb""" -exec rubyc -C {} \e; .Pp +When used without options, .Nm rubyc -without any option will create a binary executable, like the C compiler. +will create a binary executable, like the C compiler. +.Pp .Dl $ echo """p 42""" > test.rb .Dl $ rubyc test.rb .Dl $ ./a.out .Pp When building an executable, the very first file passed to .Nm rubyc -will be considered as the main file and its machine code will be ran once the executable starts. Other machine code files will be linked into the executable but only ran upon #require calls. +will be considered as the main file. Its machine code will be run once the executable starts. Other machine code files will be linked into the executable, but only run upon #require calls. +.Pp .Dl $ echo """def t1; 21; end""" > t1.rb .Dl $ echo """def t2; 21; end""" > t2.rb .Dl $ echo """require 't1'; require 't2'; p t1+t2""" > test.rb @@ -94,14 +98,15 @@ .Nm rubyc is also able to generate a dynamic library (.dylib) out of Ruby source files, using the .Fl -dylib -option. Such a library can later be linked against an executable that uses the MacRuby runtime. Like executables, the Ruby machine code files will ran upon #require calls. Libraries can also be passed to +option. Such a library can later be linked against an executable that uses the MacRuby runtime. Like executables, the Ruby machine code files will run upon #require calls. Libraries can also be passed to .Nm rubyc when forming an executable, allowing the compilation of multiple executables sharing common code. +.Pp .Dl $ rubyc t1.rb t2.rb -o code.dylib --dylib .Dl $ rubyc test.rb code.dylib -o test .Dl $ ./test .Pp .Sh SEE ALSO -.Xr ruby 1 -.Xr irb 1 +.Xr ruby 1 , +.Xr irb 1 , .Xr ruby_deploy 1

1 0

[3131] MacRuby/trunk/test_vm/ivar.rb
by source_changes＠macosforge.org 18 Dec '09

18 Dec '09

Revision: 3131 http://trac.macosforge.org/projects/ruby/changeset/3131 Author: lsansonetti(a)apple.com Date: 2009-12-17 18:23:05 -0800 (Thu, 17 Dec 2009) Log Message: ----------- added failing test (based on #499) Modified Paths: -------------- MacRuby/trunk/test_vm/ivar.rb Modified: MacRuby/trunk/test_vm/ivar.rb =================================================================== --- MacRuby/trunk/test_vm/ivar.rb 2009-12-18 01:55:13 UTC (rev 3130) +++ MacRuby/trunk/test_vm/ivar.rb 2009-12-18 02:23:05 UTC (rev 3131) @@ -122,3 +122,22 @@ end Foo.new.foo } + +assert "2\n2", %{ + class X; end + class Y < X + def set_foo; @foo = 1; end + end + class X + def set_bar; @bar = 2; end + def bar; @bar; end + end + class Z < Y + def set_foo; @foo = 3; end + end + o = Z.new + o.set_bar + p o.bar + o.set_foo + p o.bar +}

1 0