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

[3917] MacRuby/trunk/io.c
by source_changes＠macosforge.org 08 Apr '10

08 Apr '10

Revision: 3917 http://trac.macosforge.org/projects/ruby/changeset/3917 Author: martinlagardette(a)apple.com Date: 2010-04-08 11:43:26 -0700 (Thu, 08 Apr 2010) Log Message: ----------- Fixes backquote operator Only waitpid after reading output. Fixes installation of the sqlite gem. Modified Paths: -------------- MacRuby/trunk/io.c Modified: MacRuby/trunk/io.c =================================================================== --- MacRuby/trunk/io.c 2010-04-07 21:19:32 UTC (rev 3916) +++ MacRuby/trunk/io.c 2010-04-08 18:43:26 UTC (rev 3917) @@ -3344,7 +3344,9 @@ VALUE io = rb_io_s_popen(rb_cIO, 0, 1, &str); rb_io_t *io_s = ExtractIOStruct(io); - // Wait that the process is finished before reading stuff. + VALUE outbuf = rb_bstr_new(); + rb_io_read_all(ExtractIOStruct(io), outbuf); + assert(io_s->pid != -1); int status; if (waitpid(io_s->pid, &status, 0) != -1) { @@ -3352,9 +3354,8 @@ io_s->pid = -1; } - VALUE outbuf = rb_bstr_new(); - rb_io_read_all(ExtractIOStruct(io), outbuf); rb_io_close(io); + rb_str_force_encoding(outbuf, rb_encodings[ENCODING_UTF8]); return outbuf; }

1 0

[3916] MacRuby/trunk/NSString.m
by source_changes＠macosforge.org 07 Apr '10

07 Apr '10

Revision: 3916 http://trac.macosforge.org/projects/ruby/changeset/3916 Author: lsansonetti(a)apple.com Date: 2010-04-07 14:19:32 -0700 (Wed, 07 Apr 2010) Log Message: ----------- better to_str() Modified Paths: -------------- MacRuby/trunk/NSString.m Modified: MacRuby/trunk/NSString.m =================================================================== --- MacRuby/trunk/NSString.m 2010-04-07 19:45:53 UTC (rev 3915) +++ MacRuby/trunk/NSString.m 2010-04-07 21:19:32 UTC (rev 3916) @@ -19,9 +19,15 @@ VALUE rb_cNSMutableString; static inline VALUE -to_str(VALUE ary) +to_str(VALUE str) { - return rb_convert_type(ary, T_STRING, "String", "to_str"); + switch (TYPE(str)) { + case T_STRING: + return str; + case T_SYMBOL: + return rb_sym_to_s(str); + } + return rb_convert_type(str, T_STRING, "String", "to_str"); } static id

1 0

[3915] MacRuby/trunk
by source_changes＠macosforge.org 07 Apr '10

07 Apr '10

Revision: 3915 http://trac.macosforge.org/projects/ruby/changeset/3915 Author: eloy.de.enige(a)gmail.com Date: 2010-04-07 12:45:53 -0700 (Wed, 07 Apr 2010) Log Message: ----------- Once any framework is loaded, send KVO notifications from attr writers. That is, loaded through Kernel#framework. Modified Paths: -------------- MacRuby/trunk/compiler.cpp MacRuby/trunk/compiler.h MacRuby/trunk/objc.h MacRuby/trunk/objc.m MacRuby/trunk/spec/macruby/core/kvc_spec.rb MacRuby/trunk/spec/macruby/core/kvo_spec.rb Added Paths: ----------- MacRuby/trunk/spec/macruby/fixtures/kvo_wrapper.rb Modified: MacRuby/trunk/compiler.cpp =================================================================== --- MacRuby/trunk/compiler.cpp 2010-04-07 07:34:31 UTC (rev 3914) +++ MacRuby/trunk/compiler.cpp 2010-04-07 19:45:53 UTC (rev 3915) @@ -100,6 +100,7 @@ prepareIvarSlotFunc = NULL; getIvarFunc = NULL; setIvarFunc = NULL; + setKVOIvarFunc = NULL; definedFunc = NULL; undefFunc = NULL; aliasFunc = NULL; @@ -5988,7 +5989,7 @@ RoxorCompiler::compile_write_attr(ID name) { Function *f = cast<Function>(module->getOrInsertFunction("", - RubyObjTy, RubyObjTy, PtrTy, RubyObjTy, NULL)); + RubyObjTy, RubyObjTy, PtrTy, RubyObjTy, NULL)); Function::arg_iterator arg = f->arg_begin(); current_self = arg++; @@ -5997,14 +5998,19 @@ bb = BasicBlock::Create(context, "EntryBlock", f); - // This disables ivar slot generation. - // TODO: make it work - const bool old_current_instance_method = current_instance_method; - current_instance_method = false; + std::vector<Value *> params; + params.push_back(current_self); + params.push_back(compile_id(name)); + params.push_back(new_val); - Value *val = compile_ivar_assignment(name, new_val); + if (setKVOIvarFunc == NULL) { + setKVOIvarFunc = + cast<Function>(module->getOrInsertFunction("rb_vm_set_kvo_ivar", + RubyObjTy, RubyObjTy, RubyObjTy, RubyObjTy, NULL)); + } - current_instance_method = old_current_instance_method; + Value *val = CallInst::Create(setKVOIvarFunc, + params.begin(), params.end(), "", bb); ReturnInst::Create(context, val, bb); Modified: MacRuby/trunk/compiler.h =================================================================== --- MacRuby/trunk/compiler.h 2010-04-07 07:34:31 UTC (rev 3914) +++ MacRuby/trunk/compiler.h 2010-04-07 19:45:53 UTC (rev 3915) @@ -151,6 +151,7 @@ Function *prepareIvarSlotFunc; Function *getIvarFunc; Function *setIvarFunc; + Function *setKVOIvarFunc; Function *definedFunc; Function *undefFunc; Function *aliasFunc; Modified: MacRuby/trunk/objc.h =================================================================== --- MacRuby/trunk/objc.h 2010-04-07 07:34:31 UTC (rev 3914) +++ MacRuby/trunk/objc.h 2010-04-07 19:45:53 UTC (rev 3915) @@ -19,6 +19,7 @@ bs_element_method_t *bs_method, char *buf, size_t buflen); void rb_objc_define_kvo_setter(VALUE klass, ID mid); +VALUE rb_vm_set_kvo_ivar(VALUE obj, ID name, VALUE val); static inline IMP rb_objc_install_method(Class klass, SEL sel, IMP imp) Modified: MacRuby/trunk/objc.m =================================================================== --- MacRuby/trunk/objc.m 2010-04-07 07:34:31 UTC (rev 3914) +++ MacRuby/trunk/objc.m 2010-04-07 19:45:53 UTC (rev 3915) @@ -338,6 +338,8 @@ #endif } +static bool enable_kvo_notifications = false; + VALUE rb_require_framework(VALUE recv, SEL sel, int argc, VALUE *argv) { @@ -450,6 +452,8 @@ reload_class_constants(); reload_protocols(); + enable_kvo_notifications = true; + return Qtrue; } @@ -505,6 +509,21 @@ } VALUE +rb_vm_set_kvo_ivar(VALUE obj, ID name, VALUE val) +{ + NSString *key = NULL; + if (enable_kvo_notifications) { + key = [(NSString *)rb_id2str(name) substringFromIndex:1]; // skip '@' prefix + [(id)obj willChangeValueForKey:key]; + } + rb_ivar_set(obj, name, val); + if (enable_kvo_notifications) { + [(id)obj didChangeValueForKey:key]; + } + return val; +} + +VALUE rb_mod_objc_ib_outlet(VALUE recv, SEL sel, int argc, VALUE *argv) { int i; Modified: MacRuby/trunk/spec/macruby/core/kvc_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/kvc_spec.rb 2010-04-07 07:34:31 UTC (rev 3914) +++ MacRuby/trunk/spec/macruby/core/kvc_spec.rb 2010-04-07 19:45:53 UTC (rev 3915) @@ -221,3 +221,15 @@ manipulateUnorderedCollection(w) end end + +class Wrapper + attr_accessor :whatever +end + +describe "Module::attr_writer" do + it "defines an Objective-C style setter method" do + w = Wrapper.new + w.setWhatever(42) + w.whatever.should == 42 + end +end \ No newline at end of file Modified: MacRuby/trunk/spec/macruby/core/kvo_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/kvo_spec.rb 2010-04-07 07:34:31 UTC (rev 3914) +++ MacRuby/trunk/spec/macruby/core/kvo_spec.rb 2010-04-07 19:45:53 UTC (rev 3915) @@ -1,33 +1,6 @@ -require File.dirname(__FILE__) + "/../spec_helper" +require File.expand_path("../../spec_helper", __FILE__) +require File.join(FIXTURES, "kvo_wrapper") -class Wrapper - attr_accessor :whatever - - def initialize(value) - super() - @wrapped = value - @whatever= 'like, whatever' - end - - def wrappedValue - @wrapped - end -end - -class FancyWrapper < NSValue - attr_accessor :whatever - - def initialize(value) - super() - @wrapped = value - @whatever= 'like, whatever' - end - - def wrappedValue - @wrapped - end -end - describe "An Object being observed through NSKeyValueObservation" do it "retains the values for its instance variables" do # @@ -86,3 +59,40 @@ lambda { w.inspect }.should_not raise_error end end + +describe "An accessor defined with Module::attr_writer" do + it "does not send any KVO notifications unless a framework has been loaded" do + expected_output = "Manfred is very happy with himself" + + example = %{delegate = Object.new + def delegate.wrapperWillChangeValueForKey(key) + raise "did not expect a KVO notification!" + end + w = Wrapper.new + w.kvoDelegate = delegate + w.whatever = "#{expected_output}" + puts w.whatever}.gsub("\n", ";") + + output = ruby_exe(example, :options => "-r #{File.join(FIXTURES, "kvo_wrapper.rb")}") + output.chomp.should == expected_output + end + + it "sends KVO notifications, around assigning the new value, once a framework has been loaded" do + @w = Wrapper.new + @w.kvoDelegate = self + @w.whatever = "oh come on" + (@ranBefore && @ranAfter).should == true + end + + def wrapperWillChangeValueForKey(key) + key.should == "whatever" + @w.whatever.should == "like, whatever" + @ranBefore = true + end + + def wrapperDidChangeValueForKey(key) + key.should == "whatever" + @w.whatever.should == "oh come on" + @ranAfter = true + end +end \ No newline at end of file Added: MacRuby/trunk/spec/macruby/fixtures/kvo_wrapper.rb =================================================================== --- MacRuby/trunk/spec/macruby/fixtures/kvo_wrapper.rb (rev 0) +++ MacRuby/trunk/spec/macruby/fixtures/kvo_wrapper.rb 2010-04-07 19:45:53 UTC (rev 3915) @@ -0,0 +1,43 @@ +class Wrapper + attr_accessor :whatever + + def initialize(value = nil) + super() + @wrapped = value + @whatever= 'like, whatever' + end + + def wrappedValue + @wrapped + end +end + +class FancyWrapper < NSValue + attr_accessor :whatever + + def initialize(value) + super() + @wrapped = value + @whatever= 'like, whatever' + end + + def wrappedValue + @wrapped + end +end + +class Wrapper + attr_accessor :whatever + + def kvoDelegate=(delegate) + @kvoDelegate = delegate + end + + def willChangeValueForKey(key) + @kvoDelegate.wrapperWillChangeValueForKey(key) if @kvoDelegate + end + + def didChangeValueForKey(key) + @kvoDelegate.wrapperDidChangeValueForKey(key) if @kvoDelegate + end +end \ No newline at end of file

1 0

[3914] MacRuby/trunk/object.c
by source_changes＠macosforge.org 07 Apr '10

07 Apr '10

Revision: 3914 http://trac.macosforge.org/projects/ruby/changeset/3914 Author: lsansonetti(a)apple.com Date: 2010-04-07 00:34:31 -0700 (Wed, 07 Apr 2010) Log Message: ----------- fix a bug in Module#initialize which could be re-entered upon +initialize Modified Paths: -------------- MacRuby/trunk/object.c Modified: MacRuby/trunk/object.c =================================================================== --- MacRuby/trunk/object.c 2010-04-07 07:33:50 UTC (rev 3913) +++ MacRuby/trunk/object.c 2010-04-07 07:34:31 UTC (rev 3914) @@ -1840,8 +1840,16 @@ VALUE rb_mod_initialize(VALUE module, SEL sel) { - if (rb_block_given_p()) { - rb_mod_module_exec(module, 0, 1, &module); + static bool initialized = false; + if (!initialized) { + initialized = true; + // force initialize + class_getMethodImplementation((Class)module, sel); + initialized = false; + + if (rb_block_given_p()) { + rb_mod_module_exec(module, 0, 1, &module); + } } return Qnil; }

1 0

[3913] MacRuby/trunk/re.cpp
by source_changes＠macosforge.org 07 Apr '10

07 Apr '10

Revision: 3913 http://trac.macosforge.org/projects/ruby/changeset/3913 Author: lsansonetti(a)apple.com Date: 2010-04-07 00:33:50 -0700 (Wed, 07 Apr 2010) Log Message: ----------- added #names and #names_captures (atm returning empty collections) Modified Paths: -------------- MacRuby/trunk/re.cpp Modified: MacRuby/trunk/re.cpp =================================================================== --- MacRuby/trunk/re.cpp 2010-04-07 00:47:27 UTC (rev 3912) +++ MacRuby/trunk/re.cpp 2010-04-07 07:33:50 UTC (rev 3913) @@ -1082,7 +1082,59 @@ return RREGEXP(rcv)->fixed_encoding ? Qtrue : Qfalse; } +/* + * call-seq: + * rxp.names => [name1, name2, ...] + * + * Returns a list of names of captures as an array of strings. + * + * /(?<foo>.)(?<bar>.)(?<baz>.)/.names + * #=> ["foo", "bar", "baz"] + * + * /(?<foo>.)(?<foo>.)/.names + * #=> ["foo"] + * + * /(.)(.)/.names + * #=> [] + */ + static VALUE +regexp_names(VALUE rcv, SEL sel) +{ + // TODO + return rb_ary_new(); +} + +/* + * call-seq: + * rxp.named_captures => hash + * + * Returns a hash representing information about named captures of <i>rxp</i>. + * + * A key of the hash is a name of the named captures. + * A value of the hash is an array which is list of indexes of corresponding + * named captures. + * + * /(?<foo>.)(?<bar>.)/.named_captures + * #=> {"foo"=>[1], "bar"=>[2]} + * + * /(?<foo>.)(?<foo>.)/.named_captures + * #=> {"foo"=>[1, 2]} + * + * If there are no named captures, an empty hash is returned. + * + * /(.)(.)/.named_captures + * #=> {} + */ + +static VALUE +regexp_named_captures(VALUE rcv, SEL sel) +{ + // TODO + return rb_hash_new(); +} + +static VALUE match_getter(void) { VALUE match = rb_backref_get(); @@ -1218,10 +1270,10 @@ (void *)regexp_fixed_encoding, 0); #if 0 rb_objc_define_method(rb_cRegexp, "encoding", rb_reg_encoding, 0); - rb_objc_define_method(rb_cRegexp, "names", rb_reg_names, 0); +#endif + rb_objc_define_method(rb_cRegexp, "names", (void *)regexp_names, 0); rb_objc_define_method(rb_cRegexp, "named_captures", - rb_reg_named_captures, 0); -#endif + (void *)regexp_named_captures, 0); rb_objc_define_method(rb_cRegexp, "to_s", (void *)regexp_to_s, 0); rb_objc_define_method(rb_cRegexp, "inspect", (void *)regexp_inspect, 0);

1 0

[3912] MacRuby/trunk/test_vm/module.rb
by source_changes＠macosforge.org 07 Apr '10

07 Apr '10

Revision: 3912 http://trac.macosforge.org/projects/ruby/changeset/3912 Author: lsansonetti(a)apple.com Date: 2010-04-06 17:47:27 -0700 (Tue, 06 Apr 2010) Log Message: ----------- add one more test Modified Paths: -------------- MacRuby/trunk/test_vm/module.rb Modified: MacRuby/trunk/test_vm/module.rb =================================================================== --- MacRuby/trunk/test_vm/module.rb 2010-04-06 21:51:01 UTC (rev 3911) +++ MacRuby/trunk/test_vm/module.rb 2010-04-07 00:47:27 UTC (rev 3912) @@ -213,3 +213,10 @@ class Y<X end } + +assert ':ok', %{ + m = Module.new do + define_method(:foo) { p :ok } + end + Class.new.extend(m).foo +}

1 0

[3911] MacRuby/trunk/test_vm/module.rb
by source_changes＠macosforge.org 06 Apr '10

06 Apr '10

Revision: 3911 http://trac.macosforge.org/projects/ruby/changeset/3911 Author: lsansonetti(a)apple.com Date: 2010-04-06 14:51:01 -0700 (Tue, 06 Apr 2010) Log Message: ----------- added failing test Modified Paths: -------------- MacRuby/trunk/test_vm/module.rb Modified: MacRuby/trunk/test_vm/module.rb =================================================================== --- MacRuby/trunk/test_vm/module.rb 2010-04-06 00:40:25 UTC (rev 3910) +++ MacRuby/trunk/test_vm/module.rb 2010-04-06 21:51:01 UTC (rev 3911) @@ -195,3 +195,21 @@ end X.new.foo } + +assert ':ok', %{ + module M + def self.foo(v) + Module.new do + define_method(:inherited) do |klass| + super(klass) + p v + end + end + end + end + class X + extend M.foo(:ok) + end + class Y<X + end +}

1 0

[3910] MacRuby/trunk/README.rdoc
by source_changes＠macosforge.org 06 Apr '10

06 Apr '10

Revision: 3910 http://trac.macosforge.org/projects/ruby/changeset/3910 Author: lsansonetti(a)apple.com Date: 2010-04-05 17:40:25 -0700 (Mon, 05 Apr 2010) Log Message: ----------- mention that SL is recommended Modified Paths: -------------- MacRuby/trunk/README.rdoc Modified: MacRuby/trunk/README.rdoc =================================================================== --- MacRuby/trunk/README.rdoc 2010-04-05 02:47:42 UTC (rev 3909) +++ MacRuby/trunk/README.rdoc 2010-04-06 00:40:25 UTC (rev 3910) @@ -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.5.6 or later. Mac OS X 10.6 or later is recommended. * LLVM ToT, compiled for both i386 and x86_64.

1 0

[3909] MacRuby/trunk/array.c
by source_changes＠macosforge.org 05 Apr '10

05 Apr '10

Revision: 3909 http://trac.macosforge.org/projects/ruby/changeset/3909 Author: lsansonetti(a)apple.com Date: 2010-04-04 19:47:42 -0700 (Sun, 04 Apr 2010) Log Message: ----------- added conformant #to_a Modified Paths: -------------- MacRuby/trunk/array.c Modified: MacRuby/trunk/array.c =================================================================== --- MacRuby/trunk/array.c 2010-04-05 02:47:17 UTC (rev 3908) +++ MacRuby/trunk/array.c 2010-04-05 02:47:42 UTC (rev 3909) @@ -1991,6 +1991,25 @@ return rcv; } +/* + * call-seq: + * array.to_a -> array + * + * Returns _self_. If called on a subclass of Array, converts + * the receiver to an Array object. + */ + +static VALUE +rary_to_a(VALUE ary, SEL sel) +{ + if (rb_obj_class(ary) != rb_cRubyArray) { + VALUE dup = rb_ary_new(); + rary_replace(dup, 0, ary); + return dup; + } + return ary; +} + /* * call-seq: * array.clear -> array @@ -3473,6 +3492,7 @@ rary_s_try_convert, 1); rb_objc_define_method(rb_cRubyArray, "initialize", rary_initialize, -1); rb_objc_define_method(rb_cRubyArray, "initialize_copy", rary_replace, 1); + rb_objc_define_method(rb_cRubyArray, "to_a", rary_to_a, 0); rb_objc_define_method(rb_cRubyArray, "dup", rary_dup, 0); rb_objc_define_method(rb_cRubyArray, "clone", rary_clone, 0); rb_objc_define_method(rb_cRubyArray, "to_s", rary_inspect, 0);

1 0

[3908] MacRuby/trunk/encoding.c
by source_changes＠macosforge.org 05 Apr '10

05 Apr '10

Revision: 3908 http://trac.macosforge.org/projects/ruby/changeset/3908 Author: lsansonetti(a)apple.com Date: 2010-04-04 19:47:17 -0700 (Sun, 04 Apr 2010) Log Message: ----------- added #default_external=, #default_internal= Modified Paths: -------------- MacRuby/trunk/encoding.c Modified: MacRuby/trunk/encoding.c =================================================================== --- MacRuby/trunk/encoding.c 2010-04-05 01:00:33 UTC (rev 3907) +++ MacRuby/trunk/encoding.c 2010-04-05 02:47:17 UTC (rev 3908) @@ -87,12 +87,26 @@ } static VALUE +mr_enc_set_default_internal(VALUE klass, SEL sel, VALUE enc) +{ + default_internal = rb_to_encoding(enc); + return (VALUE)default_internal; +} + +static VALUE mr_enc_s_default_external(VALUE klass, SEL sel) { return (VALUE)default_external; } static VALUE +mr_enc_set_default_external(VALUE klass, SEL sel, VALUE enc) +{ + default_external = rb_to_encoding(enc); + return (VALUE)default_external; +} + +static VALUE mr_enc_name(VALUE self, SEL sel) { return rb_usascii_str_new2(RENC(self)->public_name); @@ -286,10 +300,12 @@ rb_objc_define_method(*(VALUE *)rb_cEncoding, "default_external", mr_enc_s_default_external, 0); - //rb_define_singleton_method(rb_cEncoding, "default_external=", set_default_external, 1); + rb_objc_define_method(*(VALUE *)rb_cEncoding, "default_external=", + mr_enc_set_default_external, 1); rb_objc_define_method(*(VALUE *)rb_cEncoding, "default_internal", mr_enc_s_default_internal, 0); - //rb_define_singleton_method(rb_cEncoding, "default_internal=", set_default_internal, 1); + rb_objc_define_method(*(VALUE *)rb_cEncoding, "default_internal=", + mr_enc_set_default_internal, 1); //rb_define_singleton_method(rb_cEncoding, "locale_charmap", rb_locale_charmap, 0); // Create constants.

1 0