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

[4414] MacRuby/trunk/spec/macruby/core/sandbox
by source_changes＠macosforge.org 06 Aug '10

06 Aug '10

Revision: 4414 http://trac.macosforge.org/projects/ruby/changeset/4414 Author: pthomson(a)apple.com Date: 2010-08-06 13:57:20 -0700 (Fri, 06 Aug 2010) Log Message: ----------- Even more tests. Modified Paths: -------------- MacRuby/trunk/spec/macruby/core/sandbox/no_writes_spec.rb MacRuby/trunk/spec/macruby/core/sandbox/pure_computation_spec.rb MacRuby/trunk/spec/macruby/core/sandbox/shared/no_network.rb MacRuby/trunk/spec/macruby/core/sandbox/shared/no_write.rb MacRuby/trunk/spec/macruby/core/sandbox/spec_helper.rb Added Paths: ----------- MacRuby/trunk/spec/macruby/core/sandbox/no_internet_spec.rb MacRuby/trunk/spec/macruby/core/sandbox/no_network_spec.rb MacRuby/trunk/spec/macruby/core/sandbox/temporary_writes_spec.rb Added: MacRuby/trunk/spec/macruby/core/sandbox/no_internet_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/sandbox/no_internet_spec.rb (rev 0) +++ MacRuby/trunk/spec/macruby/core/sandbox/no_internet_spec.rb 2010-08-06 20:57:20 UTC (rev 4414) @@ -0,0 +1,16 @@ +require File.expand_path(File.dirname(__FILE__) + '/spec_helper') + +describe Sandbox, ".no_network" do + + before do + add_line "framework 'Cocoa'" + add_line "Sandbox.no_network.apply!" + end + + it_behaves_like :sandbox_no_network, :no_network + + after do + ScratchPad.clear + end + +end \ No newline at end of file Added: MacRuby/trunk/spec/macruby/core/sandbox/no_network_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/sandbox/no_network_spec.rb (rev 0) +++ MacRuby/trunk/spec/macruby/core/sandbox/no_network_spec.rb 2010-08-06 20:57:20 UTC (rev 4414) @@ -0,0 +1,16 @@ +require File.expand_path(File.dirname(__FILE__) + '/spec_helper') + +describe Sandbox, ".no_network" do + + before do + add_line "framework 'Cocoa'" + add_line "Sandbox.no_network.apply!" + end + + it_behaves_like :sandbox_no_network, :no_network + + after do + ScratchPad.clear + end + +end \ No newline at end of file Modified: MacRuby/trunk/spec/macruby/core/sandbox/no_writes_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/sandbox/no_writes_spec.rb 2010-08-06 20:57:18 UTC (rev 4413) +++ MacRuby/trunk/spec/macruby/core/sandbox/no_writes_spec.rb 2010-08-06 20:57:20 UTC (rev 4414) @@ -1,6 +1,6 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper') -describe "Sandbox.no_writes" do +describe Sandbox, ".no_writes" do before do add_line "framework 'Cocoa'" Modified: MacRuby/trunk/spec/macruby/core/sandbox/pure_computation_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/sandbox/pure_computation_spec.rb 2010-08-06 20:57:18 UTC (rev 4413) +++ MacRuby/trunk/spec/macruby/core/sandbox/pure_computation_spec.rb 2010-08-06 20:57:20 UTC (rev 4414) @@ -1,6 +1,6 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper') -describe Sandbox, "pure_computation" do +describe Sandbox, ".pure_computation" do it_behaves_like :sandbox_no_write, :no_write it_behaves_like :sandbox_no_network, :no_network Modified: MacRuby/trunk/spec/macruby/core/sandbox/shared/no_network.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/sandbox/shared/no_network.rb 2010-08-06 20:57:18 UTC (rev 4413) +++ MacRuby/trunk/spec/macruby/core/sandbox/shared/no_network.rb 2010-08-06 20:57:20 UTC (rev 4414) @@ -1,12 +1,5 @@ describe :sandbox_no_network, :shared => true do - it "disallows looking up the address of the current NSHost" do - unless NSHost.currentHost.address.empty? - add_line "print NSHost.currentHost.address" - result.should be_empty - end - end - it "disallows DNS requests through NSHost" do add_line 'print NSHost.hostWithName("apple.com").address' result.should be_empty @@ -17,10 +10,4 @@ add_line 'print NSString.stringWithContentsOfURL(url)' result.should be_empty end - - it "disallows NSURLConnection.connectionWithRequest:delegate:" do - add_line 'req = NSURLRequest.requestWithURL(NSURL.URLWithString("http://apple.com"))' - add_line 'print NSURLConnection.connectionWithRequest(req, delegate:nil)' - result.should be_empty - end end Modified: MacRuby/trunk/spec/macruby/core/sandbox/shared/no_write.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/sandbox/shared/no_write.rb 2010-08-06 20:57:18 UTC (rev 4413) +++ MacRuby/trunk/spec/macruby/core/sandbox/shared/no_write.rb 2010-08-06 20:57:20 UTC (rev 4414) @@ -7,4 +7,11 @@ end end + it "throws an error when trying to write to a Ruby IO object" do + with_temporary_file do |fn| + add_line "open('#{fn}', 'w').puts 'This must fail'" + result.should_not be_empty + end + end + end Modified: MacRuby/trunk/spec/macruby/core/sandbox/spec_helper.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/sandbox/spec_helper.rb 2010-08-06 20:57:18 UTC (rev 4413) +++ MacRuby/trunk/spec/macruby/core/sandbox/spec_helper.rb 2010-08-06 20:57:20 UTC (rev 4414) @@ -11,10 +11,8 @@ end def with_temporary_file(temp = tmp('sandbox', false)) - p "Creating #{temp}" FileUtils.touch temp yield temp FileUtils.rm temp - p "Deleting #{temp}" end \ No newline at end of file Copied: MacRuby/trunk/spec/macruby/core/sandbox/temporary_writes_spec.rb (from rev 4413, MacRuby/trunk/spec/macruby/core/sandbox/no_writes_spec.rb) =================================================================== --- MacRuby/trunk/spec/macruby/core/sandbox/temporary_writes_spec.rb (rev 0) +++ MacRuby/trunk/spec/macruby/core/sandbox/temporary_writes_spec.rb 2010-08-06 20:57:20 UTC (rev 4414) @@ -0,0 +1,24 @@ +require File.expand_path(File.dirname(__FILE__) + '/spec_helper') + +describe Sandbox, ".temporary_writes" do + + before do + add_line "framework 'Cocoa'" + add_line "Sandbox.temporary_writes.apply!" + end + + it_behaves_like :sandbox_no_write, :no_write + + it "should allow writing to a file in /tmp" do + with_temporary_file("/tmp/sandboxed") do + add_line "open('/tmp/sandboxed', 'w').puts 'This must succeed'" + add_line "print 'Success'" + result.should == "Success" + end + end + + after do + ScratchPad.clear + end + +end \ No newline at end of file

1 0

[4413] MacRuby/trunk/spec/macruby/core/sandbox/fixtures/sample_file.txt
by source_changes＠macosforge.org 06 Aug '10

06 Aug '10

Revision: 4413 http://trac.macosforge.org/projects/ruby/changeset/4413 Author: pthomson(a)apple.com Date: 2010-08-06 13:57:18 -0700 (Fri, 06 Aug 2010) Log Message: ----------- remove this temporary file. Removed Paths: ------------- MacRuby/trunk/spec/macruby/core/sandbox/fixtures/sample_file.txt Deleted: MacRuby/trunk/spec/macruby/core/sandbox/fixtures/sample_file.txt =================================================================== --- MacRuby/trunk/spec/macruby/core/sandbox/fixtures/sample_file.txt 2010-08-06 20:57:17 UTC (rev 4412) +++ MacRuby/trunk/spec/macruby/core/sandbox/fixtures/sample_file.txt 2010-08-06 20:57:18 UTC (rev 4413) @@ -1 +0,0 @@ -hello \ No newline at end of file

1 0

[4412] MacRuby/trunk/spec/macruby/core/sandbox
by source_changes＠macosforge.org 06 Aug '10

06 Aug '10

Revision: 4412 http://trac.macosforge.org/projects/ruby/changeset/4412 Author: pthomson(a)apple.com Date: 2010-08-06 13:57:17 -0700 (Fri, 06 Aug 2010) Log Message: ----------- Big cleanup, much better-specified and cleaner tests Modified Paths: -------------- MacRuby/trunk/spec/macruby/core/sandbox/fixtures/sample_file.txt MacRuby/trunk/spec/macruby/core/sandbox/shared/no_write.rb Added Paths: ----------- MacRuby/trunk/spec/macruby/core/sandbox/no_writes_spec.rb MacRuby/trunk/spec/macruby/core/sandbox/pure_computation_spec.rb MacRuby/trunk/spec/macruby/core/sandbox/shared/no_network.rb MacRuby/trunk/spec/macruby/core/sandbox/spec_helper.rb Removed Paths: ------------- MacRuby/trunk/spec/macruby/core/sandbox/pure_spec.rb Property Changed: ---------------- MacRuby/trunk/spec/macruby/core/sandbox/fixtures/sample_file.txt Modified: MacRuby/trunk/spec/macruby/core/sandbox/fixtures/sample_file.txt =================================================================== --- MacRuby/trunk/spec/macruby/core/sandbox/fixtures/sample_file.txt 2010-08-06 20:57:15 UTC (rev 4411) +++ MacRuby/trunk/spec/macruby/core/sandbox/fixtures/sample_file.txt 2010-08-06 20:57:17 UTC (rev 4412) @@ -1 +1 @@ -This is some text. +hello \ No newline at end of file Property changes on: MacRuby/trunk/spec/macruby/core/sandbox/fixtures/sample_file.txt ___________________________________________________________________ Added: svn:executable + * Added: MacRuby/trunk/spec/macruby/core/sandbox/no_writes_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/sandbox/no_writes_spec.rb (rev 0) +++ MacRuby/trunk/spec/macruby/core/sandbox/no_writes_spec.rb 2010-08-06 20:57:17 UTC (rev 4412) @@ -0,0 +1,23 @@ +require File.expand_path(File.dirname(__FILE__) + '/spec_helper') + +describe "Sandbox.no_writes" do + + before do + add_line "framework 'Cocoa'" + add_line "Sandbox.no_writes.apply!" + end + + it_behaves_like :sandbox_no_write, :no_write + + it "prevents writing to a file in /tmp" do + with_temporary_file("/tmp/sandboxed") do + add_line "open('/tmp/sandboxed', 'w').puts 'This must fail'" + result.should =~ /Errno::EPERM/ + end + end + + after do + ScratchPad.clear + end + +end \ No newline at end of file Added: MacRuby/trunk/spec/macruby/core/sandbox/pure_computation_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/sandbox/pure_computation_spec.rb (rev 0) +++ MacRuby/trunk/spec/macruby/core/sandbox/pure_computation_spec.rb 2010-08-06 20:57:17 UTC (rev 4412) @@ -0,0 +1,29 @@ +require File.expand_path(File.dirname(__FILE__) + '/spec_helper') + +describe Sandbox, "pure_computation" do + + it_behaves_like :sandbox_no_write, :no_write + it_behaves_like :sandbox_no_network, :no_network + + before do + add_line "framework 'Cocoa'" + add_line "Sandbox.pure_computation.apply!" + end + + it "should cause Kernel#open to fail with Errno::EPERM" do + with_temporary_file do |temp| + add_line "open('#{temp}')" + result.should =~ /Errno::EPERM/ + end + end + + it "should cause Kernel#require to raise a LoadError" do + add_line "require '#{File.expand_path(File.dirname(__FILE__) + '/spec_helper')}'" + result.should =~ /LoadError/ + end + + after :each do + ScratchPad.clear + end + +end \ No newline at end of file Deleted: MacRuby/trunk/spec/macruby/core/sandbox/pure_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/sandbox/pure_spec.rb 2010-08-06 20:57:15 UTC (rev 4411) +++ MacRuby/trunk/spec/macruby/core/sandbox/pure_spec.rb 2010-08-06 20:57:17 UTC (rev 4412) @@ -1,16 +0,0 @@ -require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') -require File.expand_path('../shared/no_write', __FILE__) - -describe "Sandbox.pure_computation" do - - # These tests are applicable beyond just the pure_computation spec. - # Eventually the tests themselves will be farmed out to /sandbox/shared - # and all sandbox specs will just be aggregations of should_behave_like calls. - - it_behaves_like :sandbox_no_write, :no_write - - before do - @code << "Sandbox.pure_computation.apply!; " - end - -end \ No newline at end of file Added: MacRuby/trunk/spec/macruby/core/sandbox/shared/no_network.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/sandbox/shared/no_network.rb (rev 0) +++ MacRuby/trunk/spec/macruby/core/sandbox/shared/no_network.rb 2010-08-06 20:57:17 UTC (rev 4412) @@ -0,0 +1,26 @@ +describe :sandbox_no_network, :shared => true do + + it "disallows looking up the address of the current NSHost" do + unless NSHost.currentHost.address.empty? + add_line "print NSHost.currentHost.address" + result.should be_empty + end + end + + it "disallows DNS requests through NSHost" do + add_line 'print NSHost.hostWithName("apple.com").address' + result.should be_empty + end + + it "disallows NSString#stringWithContentsOfURL" do + add_line 'url = NSURL.URLWithString("http://apple.com")' + add_line 'print NSString.stringWithContentsOfURL(url)' + result.should be_empty + end + + it "disallows NSURLConnection.connectionWithRequest:delegate:" do + add_line 'req = NSURLRequest.requestWithURL(NSURL.URLWithString("http://apple.com"))' + add_line 'print NSURLConnection.connectionWithRequest(req, delegate:nil)' + result.should be_empty + end +end Modified: MacRuby/trunk/spec/macruby/core/sandbox/shared/no_write.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/sandbox/shared/no_write.rb 2010-08-06 20:57:15 UTC (rev 4411) +++ MacRuby/trunk/spec/macruby/core/sandbox/shared/no_write.rb 2010-08-06 20:57:17 UTC (rev 4412) @@ -1,22 +1,10 @@ describe :sandbox_no_write, :shared => true do - before do - @code = "error = Pointer.new_with_type('@'); " - @filename = fixture('spec/macruby/core/sandbox/shared', 'sample_file.txt') + it "prevents NSString#writeToFile from writing any characters" do + with_temporary_file do |tmp| + add_line "print 'hello'.writeToFile('#{tmp}', atomically:true)" + result.to_i.should == 0 + end end - it "prevents Objective-C methods from writing to a file" do - @code << "print 'hello'.writeToFile('#{@filename}', atomically:true)" - ruby_exe((a)code).to_i.should == 0 - end - - it "prevents Ruby methods from writing to a file" do - @code << "open('#{@filename}'); file.puts 'this must fail'" - ruby_exe((a)code).should =~ /Errno::EPERM/ - end - - it "prevents otherwise changing file attributes through the File module" do - @code << "File.chmod(0777, '#{@filename}')" - ruby_exe((a)code).should =~ /Errno::EPERM/ - end end Added: MacRuby/trunk/spec/macruby/core/sandbox/spec_helper.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/sandbox/spec_helper.rb (rev 0) +++ MacRuby/trunk/spec/macruby/core/sandbox/spec_helper.rb 2010-08-06 20:57:17 UTC (rev 4412) @@ -0,0 +1,20 @@ +require File.expand_path("../shared/no_network", __FILE__) +require File.expand_path("../shared/no_write", __FILE__) + +def add_line(line) + ScratchPad.record("") unless ScratchPad.recorded + ScratchPad << line << "; " +end + +def result + ruby_exe(ScratchPad.recorded) +end + +def with_temporary_file(temp = tmp('sandbox', false)) + p "Creating #{temp}" + FileUtils.touch temp + yield temp + FileUtils.rm temp + p "Deleting #{temp}" +end + \ No newline at end of file

1 0

[4411] MacRuby/trunk/spec/macruby/core/sandbox
by source_changes＠macosforge.org 06 Aug '10

06 Aug '10

Revision: 4411 http://trac.macosforge.org/projects/ruby/changeset/4411 Author: pthomson(a)apple.com Date: 2010-08-06 13:57:15 -0700 (Fri, 06 Aug 2010) Log Message: ----------- More tests, moved some assertions out into a shared unit. Modified Paths: -------------- MacRuby/trunk/spec/macruby/core/sandbox/pure_spec.rb Added Paths: ----------- MacRuby/trunk/spec/macruby/core/sandbox/fixtures/ MacRuby/trunk/spec/macruby/core/sandbox/fixtures/sample_file.txt MacRuby/trunk/spec/macruby/core/sandbox/shared/ MacRuby/trunk/spec/macruby/core/sandbox/shared/no_write.rb Added: MacRuby/trunk/spec/macruby/core/sandbox/fixtures/sample_file.txt =================================================================== --- MacRuby/trunk/spec/macruby/core/sandbox/fixtures/sample_file.txt (rev 0) +++ MacRuby/trunk/spec/macruby/core/sandbox/fixtures/sample_file.txt 2010-08-06 20:57:15 UTC (rev 4411) @@ -0,0 +1 @@ +This is some text. Modified: MacRuby/trunk/spec/macruby/core/sandbox/pure_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/sandbox/pure_spec.rb 2010-08-06 20:13:44 UTC (rev 4410) +++ MacRuby/trunk/spec/macruby/core/sandbox/pure_spec.rb 2010-08-06 20:57:15 UTC (rev 4411) @@ -1,4 +1,5 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') +require File.expand_path('../shared/no_write', __FILE__) describe "Sandbox.pure_computation" do @@ -6,50 +7,10 @@ # Eventually the tests themselves will be farmed out to /sandbox/shared # and all sandbox specs will just be aggregations of should_behave_like calls. - before(:all) do - @filename = File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb') - end + it_behaves_like :sandbox_no_write, :no_write - before(:each) do - @code = "Sandbox.pure_computation.apply!; " + before do + @code << "Sandbox.pure_computation.apply!; " end - it "should disallow spawning new processes" do - @code << "IO.popen('whoami')" - ruby_exe((a)code).should =~ /posix_spawn\(\) failed/ - end - - it "should disallow open()" do - @code << "open('/dev/null')" - ruby_exe((a)code).should =~ /open\(\) failed/ - end - - it "should disallow IO.read" do - @code << "p IO.read('/dev/urandom')" - ruby_exe((a)code).should =~ /open\(\) failed/ - end - - it "should disallow most NSFileManager methods" do - @code << "p NSFileManager.defaultManager.currentDirectoryPath" - ruby_exe((a)code).should =~ /nil/ - end - - it "should disallow NSString.stringWithContentsOfFile" do - @code << "p NSString.stringWithContentsOfFile('#{@filename}')" - ruby_exe((a)code).should =~ /nil/ - end - - it "should disallow NSString.writeToFile" do - @code << "p 'hello'.writeToFile('#{@filename}', atomically:true)" - ruby_exe((a)code).should =~ /0/ - end - - it "should disallow most NSWorkspace methods" do - @code = "framework 'Cocoa'; " + @code + "p NSWorkspace.sharedWorkspace.launchApplication('Finder')" - ruby_exe((a)code).should =~ /false/ - end - - it "should be frozen" do - Sandbox.pure_computation.frozen?.should be_true - end end \ No newline at end of file Added: MacRuby/trunk/spec/macruby/core/sandbox/shared/no_write.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/sandbox/shared/no_write.rb (rev 0) +++ MacRuby/trunk/spec/macruby/core/sandbox/shared/no_write.rb 2010-08-06 20:57:15 UTC (rev 4411) @@ -0,0 +1,22 @@ +describe :sandbox_no_write, :shared => true do + + before do + @code = "error = Pointer.new_with_type('@'); " + @filename = fixture('spec/macruby/core/sandbox/shared', 'sample_file.txt') + end + + it "prevents Objective-C methods from writing to a file" do + @code << "print 'hello'.writeToFile('#{@filename}', atomically:true)" + ruby_exe((a)code).to_i.should == 0 + end + + it "prevents Ruby methods from writing to a file" do + @code << "open('#{@filename}'); file.puts 'this must fail'" + ruby_exe((a)code).should =~ /Errno::EPERM/ + end + + it "prevents otherwise changing file attributes through the File module" do + @code << "File.chmod(0777, '#{@filename}')" + ruby_exe((a)code).should =~ /Errno::EPERM/ + end +end

1 0

[4410] MacRuby/trunk/objc.h
by source_changes＠macosforge.org 06 Aug '10

06 Aug '10

Revision: 4410 http://trac.macosforge.org/projects/ruby/changeset/4410 Author: lsansonetti(a)apple.com Date: 2010-08-06 13:13:44 -0700 (Fri, 06 Aug 2010) Log Message: ----------- don't use c99 features in headers Modified Paths: -------------- MacRuby/trunk/objc.h Modified: MacRuby/trunk/objc.h =================================================================== --- MacRuby/trunk/objc.h 2010-08-06 00:40:08 UTC (rev 4409) +++ MacRuby/trunk/objc.h 2010-08-06 20:13:44 UTC (rev 4410) @@ -25,7 +25,8 @@ } } else { - for (unsigned int i = 0; i < bs_method->args_count; i++) { + unsigned int i; + for (i = 0; i < bs_method->args_count; i++) { if (bs_method->args[i].index == arg) { return bs_method->args[i].type; }

1 0

[4409] MacRuby/trunk
by source_changes＠macosforge.org 06 Aug '10

06 Aug '10

Revision: 4409 http://trac.macosforge.org/projects/ruby/changeset/4409 Author: lsansonetti(a)apple.com Date: 2010-08-05 17:40:08 -0700 (Thu, 05 Aug 2010) Log Message: ----------- honor bridgesupport metadata when calculating the default objc signature of a new method Modified Paths: -------------- MacRuby/trunk/objc.h MacRuby/trunk/objc.m MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/objc.h =================================================================== --- MacRuby/trunk/objc.h 2010-08-05 20:30:53 UTC (rev 4408) +++ MacRuby/trunk/objc.h 2010-08-06 00:40:08 UTC (rev 4409) @@ -15,6 +15,26 @@ #include "bs.h" +static inline const char * +rb_get_bs_method_type(bs_element_method_t *bs_method, int arg) +{ + if (bs_method != NULL) { + if (arg == -1) { + if (bs_method->retval != NULL) { + return bs_method->retval->type; + } + } + else { + for (unsigned int i = 0; i < bs_method->args_count; i++) { + if (bs_method->args[i].index == arg) { + return bs_method->args[i].type; + } + } + } + } + return NULL; +} + bool rb_objc_get_types(VALUE recv, Class klass, SEL sel, Method m, bs_element_method_t *bs_method, char *buf, size_t buflen); Modified: MacRuby/trunk/objc.m =================================================================== --- MacRuby/trunk/objc.m 2010-08-05 20:30:53 UTC (rev 4408) +++ MacRuby/trunk/objc.m 2010-08-06 00:40:08 UTC (rev 4409) @@ -26,27 +26,6 @@ # include "bs.h" #endif -static inline const char * -rb_get_bs_method_type(bs_element_method_t *bs_method, int arg) -{ - if (bs_method != NULL) { - if (arg == -1) { - if (bs_method->retval != NULL) { - return bs_method->retval->type; - } - } - else { - int i; - for (i = 0; i < bs_method->args_count; i++) { - if (bs_method->args[i].index == arg) { - return bs_method->args[i].type; - } - } - } - } - return NULL; -} - bool rb_objc_get_types(VALUE recv, Class klass, SEL sel, Method method, bs_element_method_t *bs_method, char *buf, size_t buflen) Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2010-08-05 20:30:53 UTC (rev 4408) +++ MacRuby/trunk/vm.cpp 2010-08-06 00:40:08 UTC (rev 4409) @@ -1664,6 +1664,16 @@ #endif } +static const char * +get_bs_method_type(bs_element_method_t *bs_method, int idx) +{ + const char *type = rb_get_bs_method_type(bs_method, idx); + if (type == NULL) { + type = "@"; + } + return type; +} + static void resolve_method_type(char *buf, const size_t buflen, Class klass, Method m, SEL sel, const unsigned int types_count) @@ -1716,6 +1726,19 @@ else if (kvo_sel(klass, selname, selsize, "get", ":range:")) { } #endif + else if (bs_method != NULL) { + buf[0] = '\0'; + + // retval, self and sel. + strlcat(buf, get_bs_method_type(bs_method, -1), buflen); + strlcat(buf, "@", buflen); + strlcat(buf, ":", buflen); + + // Arguments. + for (unsigned int i = 3; i < types_count; i++) { + strlcat(buf, get_bs_method_type(bs_method, i - 3), buflen); + } + } else { assert(types_count < buflen);

1 0

[4408] MacRuby/trunk
by source_changes＠macosforge.org 05 Aug '10

05 Aug '10

Revision: 4408 http://trac.macosforge.org/projects/ruby/changeset/4408 Author: lsansonetti(a)apple.com Date: 2010-08-05 13:30:53 -0700 (Thu, 05 Aug 2010) Log Message: ----------- fixed a compiler bug where it would assume that the argument of the undef keyword would always be a literal symbol Modified Paths: -------------- MacRuby/trunk/compiler.cpp MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/compiler.cpp =================================================================== --- MacRuby/trunk/compiler.cpp 2010-08-05 08:12:49 UTC (rev 4407) +++ MacRuby/trunk/compiler.cpp 2010-08-05 20:30:53 UTC (rev 4408) @@ -4088,22 +4088,18 @@ case NODE_UNDEF: { if (undefFunc == NULL) { - // VALUE rb_vm_undef(VALUE klass, ID name, + // VALUE rb_vm_undef2(VALUE klass, VALUE sym, // unsigned char dynamic_class); undefFunc = cast<Function>(module->getOrInsertFunction( - "rb_vm_undef", - VoidTy, RubyObjTy, IntTy, Int8Ty, NULL)); + "rb_vm_undef2", + VoidTy, RubyObjTy, RubyObjTy, Int8Ty, NULL)); } assert(node->u2.node != NULL); - VALUE name = node->u2.node->nd_lit; - assert(TYPE(name) == T_SYMBOL); - ID name_id = SYM2ID(name); - Value *args[] = { compile_current_class(), - compile_id(name_id), + compile_node(node->u2.node), ConstantInt::get(Int8Ty, dynamic_class ? 1 : 0) }; compile_protected_call(undefFunc, args, args + 3); Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2010-08-05 08:12:49 UTC (rev 4407) +++ MacRuby/trunk/vm.cpp 2010-08-05 20:30:53 UTC (rev 4408) @@ -1541,6 +1541,14 @@ } extern "C" +void +rb_vm_undef2(VALUE klass, VALUE sym, unsigned char dynamic_class) +{ + assert(TYPE(sym) == T_SYMBOL); + return rb_vm_undef(klass, SYM2ID(sym), dynamic_class); +} + +extern "C" VALUE rb_vm_defined(VALUE self, int type, VALUE what, VALUE what2) {

1 0

[4407] MacRuby/trunk/vm_eval.c
by source_changes＠macosforge.org 05 Aug '10

05 Aug '10

Revision: 4407 http://trac.macosforge.org/projects/ruby/changeset/4407 Author: lsansonetti(a)apple.com Date: 2010-08-05 01:12:49 -0700 (Thu, 05 Aug 2010) Log Message: ----------- #instance_eval: don't attempt to create singleton classes on symbols Modified Paths: -------------- MacRuby/trunk/vm_eval.c Modified: MacRuby/trunk/vm_eval.c =================================================================== --- MacRuby/trunk/vm_eval.c 2010-08-05 00:34:39 UTC (rev 4406) +++ MacRuby/trunk/vm_eval.c 2010-08-05 08:12:49 UTC (rev 4407) @@ -521,19 +521,16 @@ { VALUE klass; - if (SPECIAL_CONST_P(self)) { + if (SPECIAL_CONST_P(self) || CLASS_OF(self) == rb_cSymbol) { klass = 0; } else { - switch (TYPE(self)) { - default: - klass = rb_singleton_class(self); - switch (TYPE(top)) { - case T_CLASS: - case T_MODULE: - rb_vm_set_outer(klass, top); - break; - } + klass = rb_singleton_class(self); + switch (TYPE(top)) { + case T_CLASS: + case T_MODULE: + rb_vm_set_outer(klass, top); + break; } } return specific_eval(argc, argv, klass, self);

1 0

[4406] MacRuby/trunk/struct.c
by source_changes＠macosforge.org 05 Aug '10

05 Aug '10

Revision: 4406 http://trac.macosforge.org/projects/ruby/changeset/4406 Author: lsansonetti(a)apple.com Date: 2010-08-04 17:34:39 -0700 (Wed, 04 Aug 2010) Log Message: ----------- fix Struct#eql? on nested structs Modified Paths: -------------- MacRuby/trunk/struct.c Modified: MacRuby/trunk/struct.c =================================================================== --- MacRuby/trunk/struct.c 2010-08-04 20:53:09 UTC (rev 4405) +++ MacRuby/trunk/struct.c 2010-08-05 00:34:39 UTC (rev 4406) @@ -875,21 +875,35 @@ */ static VALUE +rb_struct_eql_r(VALUE s, VALUE s2, int recur) +{ + if (recur) { + return Qtrue; + } + for (int i = 0; i < RSTRUCT_LEN(s); i++) { + if (!rb_eql(RSTRUCT_PTR(s)[i], RSTRUCT_PTR(s2)[i])) { + return Qfalse; + } + } + return Qtrue; +} + +static VALUE rb_struct_eql(VALUE s, SEL sel, VALUE s2) { - long i; - - if (s == s2) return Qtrue; - if (TYPE(s2) != T_STRUCT) return Qfalse; - if (rb_obj_class(s) != rb_obj_class(s2)) return Qfalse; + if (s == s2) { + return Qtrue; + } + if (TYPE(s2) != T_STRUCT) { + return Qfalse; + } + if (rb_obj_class(s) != rb_obj_class(s2)) { + return Qfalse; + } if (RSTRUCT_LEN(s) != RSTRUCT_LEN(s2)) { rb_bug("inconsistent struct"); /* should never happen */ } - - for (i=0; i<RSTRUCT_LEN(s); i++) { - if (!rb_eql(RSTRUCT_PTR(s)[i], RSTRUCT_PTR(s2)[i])) return Qfalse; - } - return Qtrue; + return rb_exec_recursive(rb_struct_eql_r, s, s2); } /*

1 0

[4405] MacRuby/trunk/ext/zlib/zlib.c
by source_changes＠macosforge.org 04 Aug '10

04 Aug '10

Revision: 4405 http://trac.macosforge.org/projects/ruby/changeset/4405 Author: lsansonetti(a)apple.com Date: 2010-08-04 13:53:09 -0700 (Wed, 04 Aug 2010) Log Message: ----------- fixed a crasher in Zlib::Deflate.deflate (apparently introduced since r2347...) Revision Links: -------------- http://trac.macosforge.org/projects/ruby/changeset/2347 Modified Paths: -------------- MacRuby/trunk/ext/zlib/zlib.c Modified: MacRuby/trunk/ext/zlib/zlib.c =================================================================== --- MacRuby/trunk/ext/zlib/zlib.c 2010-08-04 08:31:33 UTC (rev 4404) +++ MacRuby/trunk/ext/zlib/zlib.c 2010-08-04 20:53:09 UTC (rev 4405) @@ -1103,12 +1103,14 @@ static VALUE rb_deflate_s_deflate(VALUE klass, SEL sel, int argc, VALUE *argv) { - struct zstream *z = (struct zstream*)zstream_deflate_new(klass); + struct zstream *z; VALUE src, level, dst, args[2]; int err, lev; rb_scan_args(argc, argv, "11", &src, &level); + z = (struct zstream *)xmalloc(sizeof(struct zstream)); + lev = ARG_LEVEL(level); StringValue(src); src = rb_str_bstr(src);

1 0