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

[2855] MacRuby/trunk/dispatcher.cpp
by source_changes＠macosforge.org 19 Oct '09

19 Oct '09

Revision: 2855 http://trac.macosforge.org/projects/ruby/changeset/2855 Author: eloy.de.enige(a)gmail.com Date: 2009-10-19 16:36:46 -0700 (Mon, 19 Oct 2009) Log Message: ----------- If a method has been removed, with remove_method, make sure respond_to returns false. Modified Paths: -------------- MacRuby/trunk/dispatcher.cpp Modified: MacRuby/trunk/dispatcher.cpp =================================================================== --- MacRuby/trunk/dispatcher.cpp 2009-10-19 23:36:38 UTC (rev 2854) +++ MacRuby/trunk/dispatcher.cpp 2009-10-19 23:36:46 UTC (rev 2855) @@ -555,18 +555,12 @@ recache2: IMP imp = method_getImplementation(method); - if (UNDEFINED_IMP(imp)) { + if (UNDEFINED_IMP(imp) + || (REMOVED_IMP(imp) + && rb_vm_super_lookup((VALUE)klass, sel) == NULL)) { // Method was undefined. goto call_method_missing; } - else if (REMOVED_IMP(imp)) { - // Method was removed, let's see if any of the ancestors does - // implement the method. - method = rb_vm_super_lookup((VALUE)klass, sel); - if (method == NULL) { - goto call_method_missing; - } - } rb_vm_method_node_t *node = GET_CORE()->method_node_get(method); @@ -1777,7 +1771,10 @@ } } - if (m == NULL || UNDEFINED_IMP(method_getImplementation(m))) { + IMP imp = method_getImplementation(m); + if (UNDEFINED_IMP(imp) + || (REMOVED_IMP(imp) + && rb_vm_super_lookup((VALUE)klass, sel) == NULL)) { return false; }

1 0

[2854] MacRuby/trunk
by source_changes＠macosforge.org 19 Oct '09

19 Oct '09

Revision: 2854 http://trac.macosforge.org/projects/ruby/changeset/2854 Author: eloy.de.enige(a)gmail.com Date: 2009-10-19 16:36:38 -0700 (Mon, 19 Oct 2009) Log Message: ----------- Replace method implementation with a stub when remove_method is used. This is later used to check if we should lookup the method in the ancestor chain. Modified Paths: -------------- MacRuby/trunk/dispatcher.cpp MacRuby/trunk/vm.h MacRuby/trunk/vm_method.c Modified: MacRuby/trunk/dispatcher.cpp =================================================================== --- MacRuby/trunk/dispatcher.cpp 2009-10-19 23:06:34 UTC (rev 2853) +++ MacRuby/trunk/dispatcher.cpp 2009-10-19 23:36:38 UTC (rev 2854) @@ -350,6 +350,14 @@ return NULL; // never reached } +extern "C" +void * +rb_vm_removed_imp(void *rcv, SEL sel) +{ + method_missing((VALUE)rcv, sel, NULL, NULL, NULL, METHOD_MISSING_DEFAULT); + return NULL; // never reached +} + static force_inline VALUE __rb_vm_ruby_dispatch(VALUE top, VALUE self, SEL sel, rb_vm_method_node_t *node, unsigned char opt, @@ -551,6 +559,14 @@ // Method was undefined. goto call_method_missing; } + else if (REMOVED_IMP(imp)) { + // Method was removed, let's see if any of the ancestors does + // implement the method. + method = rb_vm_super_lookup((VALUE)klass, sel); + if (method == NULL) { + goto call_method_missing; + } + } rb_vm_method_node_t *node = GET_CORE()->method_node_get(method); Modified: MacRuby/trunk/vm.h =================================================================== --- MacRuby/trunk/vm.h 2009-10-19 23:06:34 UTC (rev 2853) +++ MacRuby/trunk/vm.h 2009-10-19 23:36:38 UTC (rev 2854) @@ -284,6 +284,8 @@ bool rb_vm_resolve_method(Class klass, SEL sel); void *rb_vm_undefined_imp(void *rcv, SEL sel); #define UNDEFINED_IMP(imp) (imp == NULL || imp == (IMP)rb_vm_undefined_imp) +void *rb_vm_removed_imp(void *rcv, SEL sel); +#define REMOVED_IMP(imp) (imp == (IMP)rb_vm_removed_imp) void rb_vm_define_attr(Class klass, const char *name, bool read, bool write); void rb_vm_undef_method(Class klass, ID name, bool must_exist); void rb_vm_alias(VALUE klass, ID name, ID def); Modified: MacRuby/trunk/vm_method.c =================================================================== --- MacRuby/trunk/vm_method.c 2009-10-19 23:06:34 UTC (rev 2853) +++ MacRuby/trunk/vm_method.c 2009-10-19 23:36:38 UTC (rev 2854) @@ -147,7 +147,7 @@ rb_warn("removing pure Objective-C method `%s' may cause serious " \ "problem", rb_id2name(mid)); } - method_setImplementation(m, NULL); + method_setImplementation(m, (IMP)rb_vm_removed_imp); if (RCLASS_SINGLETON(klass)) { rb_funcall(rb_iv_get(klass, "__attached__"), singleton_removed, 1,

1 0

[2853] MacRuby/trunk/string.c
by source_changes＠macosforge.org 19 Oct '09

19 Oct '09

Revision: 2853 http://trac.macosforge.org/projects/ruby/changeset/2853 Author: lsansonetti(a)apple.com Date: 2009-10-19 16:06:34 -0700 (Mon, 19 Oct 2009) Log Message: ----------- String#dup: make sure we honor the receiver's class Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2009-10-19 22:52:16 UTC (rev 2852) +++ MacRuby/trunk/string.c 2009-10-19 23:06:34 UTC (rev 2853) @@ -326,17 +326,16 @@ { VALUE dup; -#if 1 if (*(VALUE *)str == rb_cByteString) { dup = rb_bytestring_copy(str); } else { dup = (VALUE)CFStringCreateMutableCopy(NULL, 0, (CFStringRef)str); CFMakeCollectable((CFTypeRef)dup); + if (*(VALUE *)str != rb_cSymbol) { + *(VALUE *)dup = *(VALUE *)str; + } } -#else - dup = (VALUE)objc_msgSend((id)str, selMutableCopy); -#endif if (OBJ_TAINTED(str)) { OBJ_TAINT(dup);

1 0

[2852] MacRuby/trunk/compiler.cpp
by source_changes＠macosforge.org 19 Oct '09

19 Oct '09

Revision: 2852 http://trac.macosforge.org/projects/ruby/changeset/2852 Author: lsansonetti(a)apple.com Date: 2009-10-19 15:52:16 -0700 (Mon, 19 Oct 2009) Log Message: ----------- revert parts of r2839 because it breaks the gcd spec - strange bug implying exception handlers (sorry vincent) Revision Links: -------------- http://trac.macosforge.org/projects/ruby/changeset/2839 Modified Paths: -------------- MacRuby/trunk/compiler.cpp Modified: MacRuby/trunk/compiler.cpp =================================================================== --- MacRuby/trunk/compiler.cpp 2009-10-19 19:35:08 UTC (rev 2851) +++ MacRuby/trunk/compiler.cpp 2009-10-19 22:52:16 UTC (rev 2852) @@ -58,7 +58,6 @@ return_from_block_ids = 0; ensure_pn = NULL; current_scope = NULL; - class_declaration = false; dispatcherFunc = NULL; fastPlusFunc = NULL; @@ -2990,8 +2989,7 @@ { rb_vm_arity_t arity = rb_vm_node_arity(node); const int nargs = bb == NULL ? 0 : arity.real; - const bool has_dvars = current_block && current_mid == 0 && !class_declaration; - class_declaration = false; + const bool has_dvars = current_block && current_mid == 0; // Get dynamic vars. if (has_dvars && node->nd_tbl != NULL) { @@ -3025,13 +3023,14 @@ FunctionType *ft = FunctionType::get(RubyObjTy, types, false); std::string function_name; - if (ruby_aot_compile) { + if (ruby_aot_compile) { function_name.append(RSTRING_PTR(ruby_aot_init_func)); function_name.append("_ruby_scope"); - } - else { + } + else { function_name.append("__ruby_scope"); - } + } + Function *f = Function::Create(ft, GlobalValue::ExternalLinkage, function_name, module); @@ -3893,6 +3892,11 @@ NODE *body = node->nd_body; if (body != NULL) { assert(nd_type(body) == NODE_SCOPE); + ID *tbl = body->nd_tbl; + if (tbl != NULL) { + const int args_count = (int)tbl[0]; + compile_lvars(&tbl[args_count + 1]); + } if (body->nd_body != NULL) { Value *old_self = current_self; current_self = classVal; @@ -3903,12 +3907,7 @@ GlobalValue::InternalLinkage, nilVal, ""); bool old_current_module = current_module; - bool old_current_block_chain = current_block_chain; - bool old_dynamic_class = dynamic_class; - current_block_chain = false; - dynamic_class = false; - std::map<ID, Value *> old_ivar_slots_cache = ivar_slots_cache; ivar_slots_cache.clear(); @@ -3918,18 +3917,11 @@ current_module = nd_type(node) == NODE_MODULE; compile_set_current_scope(classVal, publicScope); + bool old_dynamic_class = dynamic_class; + dynamic_class = false; - DEBUG_LEVEL_INC(); - class_declaration = true; - Value *val = compile_node(body); - Function *f = cast<Function>(val); - DEBUG_LEVEL_DEC(); + Value *val = compile_node(body->nd_body); - std::vector<Value *> params; - params.push_back(classVal); - params.push_back(compile_const_pointer(NULL)); - val = compile_protected_call(f, params); - dynamic_class = old_dynamic_class; compile_set_current_scope(classVal, defaultScope); @@ -3939,7 +3931,6 @@ current_self = old_self; current_opened_class = old_class; current_module = old_current_module; - current_block_chain = old_current_block_chain; ivar_slots_cache = old_ivar_slots_cache;

1 0

[2851] MacRuby/trunk/test_vm/module.rb
by source_changes＠macosforge.org 19 Oct '09

19 Oct '09

Revision: 2851 http://trac.macosforge.org/projects/ruby/changeset/2851 Author: eloy.de.enige(a)gmail.com Date: 2009-10-19 12:35:08 -0700 (Mon, 19 Oct 2009) Log Message: ----------- Added an extra failing test_vm test to illustrate Modules don't allow instantiation. #378 Keith Gautreaux. Modified Paths: -------------- MacRuby/trunk/test_vm/module.rb Modified: MacRuby/trunk/test_vm/module.rb =================================================================== --- MacRuby/trunk/test_vm/module.rb 2009-10-19 03:28:40 UTC (rev 2850) +++ MacRuby/trunk/test_vm/module.rb 2009-10-19 19:35:08 UTC (rev 2851) @@ -45,3 +45,13 @@ p :ok end } + +assert ':ok', %{ + M = Module.new + begin + M.new + p :ko + rescue NoMethodError + p :ok + end +}

1 0

[2850] MacRuby/trunk
by source_changes＠macosforge.org 19 Oct '09

19 Oct '09

Revision: 2850 http://trac.macosforge.org/projects/ruby/changeset/2850 Author: lsansonetti(a)apple.com Date: 2009-10-18 20:28:40 -0700 (Sun, 18 Oct 2009) Log Message: ----------- expose a new API (to be used by a future patch) Modified Paths: -------------- MacRuby/trunk/objc.h MacRuby/trunk/objc.m Modified: MacRuby/trunk/objc.h =================================================================== --- MacRuby/trunk/objc.h 2009-10-18 19:40:00 UTC (rev 2849) +++ MacRuby/trunk/objc.h 2009-10-19 03:28:40 UTC (rev 2850) @@ -80,6 +80,8 @@ id rb_rb2oc_exception(VALUE exc); VALUE rb_oc2rb_exception(id exc); +size_t rb_objc_type_size(const char *type); + static inline int SubtypeUntil(const char *type, char end) { Modified: MacRuby/trunk/objc.m =================================================================== --- MacRuby/trunk/objc.m 2009-10-18 19:40:00 UTC (rev 2849) +++ MacRuby/trunk/objc.m 2009-10-19 03:28:40 UTC (rev 2850) @@ -643,6 +643,21 @@ return rb_exc_new2(rb_eRuntimeError, buf); } +size_t +rb_objc_type_size(const char *type) +{ + @try { + NSUInteger size, align; + NSGetSizeAndAlignment(type, &size, &align); + return size; + } + @catch (id ex) { + rb_raise(rb_eRuntimeError, "can't get the size of type `%s': %s", + type, [[ex description] UTF8String]); + } + return 0; // never reached +} + void *placeholder_String = NULL; void *placeholder_Dictionary = NULL; void *placeholder_Array = NULL;

1 0

[2849] MacRuby/trunk/TODO
by source_changes＠macosforge.org 18 Oct '09

18 Oct '09

Revision: 2849 http://trac.macosforge.org/projects/ruby/changeset/2849 Author: lsansonetti(a)apple.com Date: 2009-10-18 12:40:00 -0700 (Sun, 18 Oct 2009) Log Message: ----------- refreshed Modified Paths: -------------- MacRuby/trunk/TODO Modified: MacRuby/trunk/TODO =================================================================== --- MacRuby/trunk/TODO 2009-10-18 07:26:18 UTC (rev 2848) +++ MacRuby/trunk/TODO 2009-10-18 19:40:00 UTC (rev 2849) @@ -9,6 +9,7 @@ [ ] Hash subclass for immediates [ ] try/catch should use a C++ exception [X] implement 'protected' visibility +[ ] implement NODE_LAMBDA (1.9 proc syntax) [ ] remaining Cocoa bugs [X] ObjC exceptions should be catchable in Ruby [X] honor BridgeSupport sel_of_type attribute

1 0

[2848] MacRuby/trunk/lib
by source_changes＠macosforge.org 18 Oct '09

18 Oct '09

Revision: 2848 http://trac.macosforge.org/projects/ruby/changeset/2848 Author: lsansonetti(a)apple.com Date: 2009-10-18 00:26:18 -0700 (Sun, 18 Oct 2009) Log Message: ----------- added copyright headers Modified Paths: -------------- MacRuby/trunk/lib/stringio.rb MacRuby/trunk/lib/strscan.rb Modified: MacRuby/trunk/lib/stringio.rb =================================================================== --- MacRuby/trunk/lib/stringio.rb 2009-10-18 04:26:40 UTC (rev 2847) +++ MacRuby/trunk/lib/stringio.rb 2009-10-18 07:26:18 UTC (rev 2848) @@ -1,3 +1,9 @@ +# MacRuby implementation of stringio. +# +# This file is covered by the Ruby license. See COPYING for more details. +# +# Copyright (C) 2009, Apple Inc. All rights reserved. + class StringIO attr_reader :string, :pos Modified: MacRuby/trunk/lib/strscan.rb =================================================================== --- MacRuby/trunk/lib/strscan.rb 2009-10-18 04:26:40 UTC (rev 2847) +++ MacRuby/trunk/lib/strscan.rb 2009-10-18 07:26:18 UTC (rev 2848) @@ -1,3 +1,9 @@ +# MacRuby implementation of strscan. +# +# This file is covered by the Ruby license. See COPYING for more details. +# +# Copyright (C) 2009, Apple Inc. All rights reserved. + class ScanError < StandardError; end # StringScanner provides for lexical scanning operations on a String. Here is @@ -640,4 +646,4 @@ getstr ? m : m.size end -end \ No newline at end of file +end

1 0

[2847] MacRuby/trunk/compiler.cpp
by source_changes＠macosforge.org 18 Oct '09

18 Oct '09

Revision: 2847 http://trac.macosforge.org/projects/ruby/changeset/2847 Author: lsansonetti(a)apple.com Date: 2009-10-17 21:26:40 -0700 (Sat, 17 Oct 2009) Log Message: ----------- better function name generation (the previous code didn't build on recent versions of gcc) Modified Paths: -------------- MacRuby/trunk/compiler.cpp Modified: MacRuby/trunk/compiler.cpp =================================================================== --- MacRuby/trunk/compiler.cpp 2009-10-18 04:15:53 UTC (rev 2846) +++ MacRuby/trunk/compiler.cpp 2009-10-18 04:26:40 UTC (rev 2847) @@ -3024,14 +3024,13 @@ } FunctionType *ft = FunctionType::get(RubyObjTy, types, false); - char *function_name; + std::string function_name; if (ruby_aot_compile) { - const int function_name_size = 200; - function_name = (char *)alloca(function_name_size); - snprintf(function_name, function_name_size, "__%s_ruby_scope", RSTRING_PTR(ruby_aot_init_func)); + function_name.append(RSTRING_PTR(ruby_aot_init_func)); + function_name.append("_ruby_scope"); } else { - function_name = "__ruby_scope"; + function_name.append("__ruby_scope"); } Function *f = Function::Create(ft, GlobalValue::ExternalLinkage, function_name, module);

1 0

[2846] MacRuby/trunk/lib/iconv.rb
by source_changes＠macosforge.org 18 Oct '09

18 Oct '09

Revision: 2846 http://trac.macosforge.org/projects/ruby/changeset/2846 Author: lsansonetti(a)apple.com Date: 2009-10-17 21:15:53 -0700 (Sat, 17 Oct 2009) Log Message: ----------- adding dummy pure-ruby iconv implementation Added Paths: ----------- MacRuby/trunk/lib/iconv.rb Added: MacRuby/trunk/lib/iconv.rb =================================================================== --- MacRuby/trunk/lib/iconv.rb (rev 0) +++ MacRuby/trunk/lib/iconv.rb 2009-10-18 04:15:53 UTC (rev 2846) @@ -0,0 +1,57 @@ +# MacRuby implementation of iconv. +# +# This file is covered by the Ruby license. See COPYING for more details. +# +# Copyright (C) 2009, Apple Inc. All rights reserved. + +framework 'Foundation' + +class Iconv + # TODO: lots of things... help! + + def self.iconv(to, from, str) + new(from, to).iconv(str) + end + + def initialize(to, from, options=nil) + @to_enc = ns_encoding(to) + @from_enc = ns_encoding(from) + end + + def iconv(str, start=0, length=-1) + # Not sure if it's the right thing to do... + data = CFStringCreateExternalRepresentation(nil, str, @to_enc, 0) + if data.nil? + raise "can't retrieve data from `#{str}'" + end + dest = CFStringCreateFromExternalRepresentation(nil, data, @to_enc) + if dest.nil? + raise "can't convert data from `#{str}'" + end + CFRelease(data) + CFRelease(dest) + dest.mutableCopy + end + + private + + ENCS = {} + def ns_encoding(str) + if ENCS.empty? + # Build database. + ptr = CFStringGetListOfAvailableEncodings() + i = 0 + while (enc = ptr[i]) != KCFStringEncodingInvalidId + enc_name = CFStringConvertEncodingToIANACharSetName(enc) + ENCS[enc_name] = enc + i += 1 + end + end + str = str.downcase + enc = ENCS[str] + if enc.nil? + raise "unrecognized encoding `#{enc}'" + end + return enc + end +end

1 0