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

[3759] MacRuby/trunk/spec/macruby/core
by source_changes＠macosforge.org 13 Mar '10

13 Mar '10

Revision: 3759 http://trac.macosforge.org/projects/ruby/changeset/3759 Author: lsansonetti(a)apple.com Date: 2010-03-12 20:31:56 -0800 (Fri, 12 Mar 2010) Log Message: ----------- refreshed specs to follow the new String changes Modified Paths: -------------- MacRuby/trunk/spec/macruby/core/cftype_spec.rb MacRuby/trunk/spec/macruby/core/string_spec.rb Modified: MacRuby/trunk/spec/macruby/core/cftype_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/cftype_spec.rb 2010-03-13 04:31:34 UTC (rev 3758) +++ MacRuby/trunk/spec/macruby/core/cftype_spec.rb 2010-03-13 04:31:56 UTC (rev 3759) @@ -20,14 +20,14 @@ it "toll-free bridged to an Objective-C type behaves like the Objective-C version" do s = CFStringCreateWithCString(nil, "foo", KCFStringEncodingUTF8) - s.class.should == NSString + s.class.should == String s.should == 'foo' CFRelease(s) end it "can be substitued with the toll-free bridged equivalent" do s = CFStringCreateMutableCopy(nil, 0, "foo") - s.class.should == NSMutableString + s.class.should == String s.should == 'foo' CFRelease(s) end Modified: MacRuby/trunk/spec/macruby/core/string_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/string_spec.rb 2010-03-13 04:31:34 UTC (rev 3758) +++ MacRuby/trunk/spec/macruby/core/string_spec.rb 2010-03-13 04:31:56 UTC (rev 3759) @@ -1,8 +1,9 @@ require File.dirname(__FILE__) + "/../spec_helper" describe "The String class" do - it "is an alias to NSMutableString" do - String.should == NSMutableString + it "is a direct subclass of NSMutableString" do + String.class.should == Class + String.superclass.should == NSMutableString end it "can be subclassed and later instantiated" do

1 0

[3758] MacRuby/trunk/object.c
by source_changes＠macosforge.org 13 Mar '10

13 Mar '10

Revision: 3758 http://trac.macosforge.org/projects/ruby/changeset/3758 Author: lsansonetti(a)apple.com Date: 2010-03-12 20:31:34 -0800 (Fri, 12 Mar 2010) Log Message: ----------- fixed #is_a? for NSString subclasses Modified Paths: -------------- MacRuby/trunk/object.c Modified: MacRuby/trunk/object.c =================================================================== --- MacRuby/trunk/object.c 2010-03-13 04:31:10 UTC (rev 3757) +++ MacRuby/trunk/object.c 2010-03-13 04:31:34 UTC (rev 3758) @@ -586,6 +586,9 @@ } const long v = RCLASS_VERSION(cl); + if (c == rb_cRubyString && (v & RCLASS_IS_STRING_SUBCLASS)) { + return Qtrue; + } if (c == rb_cRubyArray && (v & RCLASS_IS_ARRAY_SUBCLASS)) { return Qtrue; }

1 0

[3757] MacRuby/trunk/numeric.c
by source_changes＠macosforge.org 13 Mar '10

13 Mar '10

Revision: 3757 http://trac.macosforge.org/projects/ruby/changeset/3757 Author: lsansonetti(a)apple.com Date: 2010-03-12 20:31:10 -0800 (Fri, 12 Mar 2010) Log Message: ----------- re-indent bad code Modified Paths: -------------- MacRuby/trunk/numeric.c Modified: MacRuby/trunk/numeric.c =================================================================== --- MacRuby/trunk/numeric.c 2010-03-13 04:20:25 UTC (rev 3756) +++ MacRuby/trunk/numeric.c 2010-03-13 04:31:10 UTC (rev 3757) @@ -3212,14 +3212,15 @@ * fix.popcnt => Fixnum * * Returns the number of 1 bits set in the internal representation of - * <i>fix</i>. This function returns consistent results across platforms for - * positive numbers, but may vary for negative numbers. + * <i>fix</i>. This function returns consistent results across platforms for + * positive numbers, but may vary for negative numbers. * */ + static VALUE fix_popcnt(VALUE num, SEL sel) { - return INT2FIX(__builtin_popcountl(FIX2ULONG(num))); + return INT2FIX(__builtin_popcountl(FIX2ULONG(num))); } /*

1 0

[3756] MacRuby/trunk/TODO
by source_changes＠macosforge.org 13 Mar '10

13 Mar '10

Revision: 3756 http://trac.macosforge.org/projects/ruby/changeset/3756 Author: lsansonetti(a)apple.com Date: 2010-03-12 20:20:25 -0800 (Fri, 12 Mar 2010) Log Message: ----------- refreshed Modified Paths: -------------- MacRuby/trunk/TODO Modified: MacRuby/trunk/TODO =================================================================== --- MacRuby/trunk/TODO 2010-03-13 04:04:38 UTC (rev 3755) +++ MacRuby/trunk/TODO 2010-03-13 04:20:25 UTC (rev 3756) @@ -1,8 +1,9 @@ For 0.6: [X] new Hash class, insertion ordering support, optimized for immediate types -[/] new String class, support for 1.9 encoding semantics -[/] refactor the Array, Hash and String models +[/] new String and Symbol classes, support for 1.9 encoding semantics +[/] new Regexp class, thread-safe, ICU-based +[/] refactor the Array, Hash and String Foundation bridging models [X] Hash [X] Array [ ] String

1 0

[3755] MacRuby/trunk/TODO
by source_changes＠macosforge.org 13 Mar '10

13 Mar '10

Revision: 3755 http://trac.macosforge.org/projects/ruby/changeset/3755 Author: lsansonetti(a)apple.com Date: 2010-03-12 20:04:38 -0800 (Fri, 12 Mar 2010) Log Message: ----------- do not forget to implement basic Numeric methods on NSNumber Modified Paths: -------------- MacRuby/trunk/TODO Modified: MacRuby/trunk/TODO =================================================================== --- MacRuby/trunk/TODO 2010-03-13 04:04:15 UTC (rev 3754) +++ MacRuby/trunk/TODO 2010-03-13 04:04:38 UTC (rev 3755) @@ -6,6 +6,7 @@ [X] Hash [X] Array [ ] String +[ ] implement basic Numeric methods on NSNumber [/] debugger [/] command-line tool [ ] Xcode plugin

1 0

[3754] MacRuby/trunk
by source_changes＠macosforge.org 13 Mar '10

13 Mar '10

Revision: 3754 http://trac.macosforge.org/projects/ruby/changeset/3754 Author: lsansonetti(a)apple.com Date: 2010-03-12 20:04:15 -0800 (Fri, 12 Mar 2010) Log Message: ----------- inline the boxing code Modified Paths: -------------- MacRuby/trunk/numeric.c MacRuby/trunk/objc.h Modified: MacRuby/trunk/numeric.c =================================================================== --- MacRuby/trunk/numeric.c 2010-03-13 03:57:05 UTC (rev 3753) +++ MacRuby/trunk/numeric.c 2010-03-13 04:04:15 UTC (rev 3754) @@ -93,34 +93,6 @@ VALUE rb_eZeroDivError; VALUE rb_eFloatDomainError; -static VALUE -rb_box_fixfloat0(double value) -{ - CFNumberRef number = CFNumberCreate(NULL, kCFNumberDoubleType, &value); - CFMakeCollectable(number); - return (VALUE)number; -} - -VALUE -rb_box_fixfloat(VALUE fixfloat) -{ - return rb_box_fixfloat0(NUM2DBL(fixfloat)); -} - -static VALUE -rb_box_fixnum0(long value) -{ - CFNumberRef number = CFNumberCreate(NULL, kCFNumberLongType, &value); - CFMakeCollectable(number); - return (VALUE)number; -} - -VALUE -rb_box_fixnum(VALUE fixnum) -{ - return rb_box_fixnum0(FIX2LONG(fixnum)); -} - void rb_num_zerodiv(void) { Modified: MacRuby/trunk/objc.h =================================================================== --- MacRuby/trunk/objc.h 2010-03-13 03:57:05 UTC (rev 3753) +++ MacRuby/trunk/objc.h 2010-03-13 04:04:15 UTC (rev 3754) @@ -167,9 +167,6 @@ return arity; } -VALUE rb_box_fixnum(VALUE); -VALUE rb_box_fixfloat(VALUE); - static inline id rb_rval_to_ocid(VALUE obj) { @@ -184,10 +181,17 @@ return (id)kCFNull; } if (FIXNUM_P(obj)) { - return (id)rb_box_fixnum(obj); + long val = FIX2LONG(obj); + CFNumberRef number = CFNumberCreate(NULL, kCFNumberLongType, &val); + CFMakeCollectable(number); + return (id)number; } if (FIXFLOAT_P(obj)) { - return (id)rb_box_fixfloat(obj); + double val = NUM2DBL(obj); + CFNumberRef number = CFNumberCreate(NULL, kCFNumberDoubleType, + &val); + CFMakeCollectable(number); + return (id)number; } } return (id)obj;

1 0

[3753] MacRuby/trunk
by source_changes＠macosforge.org 13 Mar '10

13 Mar '10

Revision: 3753 http://trac.macosforge.org/projects/ruby/changeset/3753 Author: lsansonetti(a)apple.com Date: 2010-03-12 19:57:05 -0800 (Fri, 12 Mar 2010) Log Message: ----------- let's get rid of Fixnum and Float boxing classes and use NSNumbers Modified Paths: -------------- MacRuby/trunk/class.c MacRuby/trunk/include/ruby/ruby.h MacRuby/trunk/numeric.c Modified: MacRuby/trunk/class.c =================================================================== --- MacRuby/trunk/class.c 2010-03-13 03:27:20 UTC (rev 3752) +++ MacRuby/trunk/class.c 2010-03-13 03:57:05 UTC (rev 3753) @@ -79,15 +79,9 @@ static BOOL rb_obj_imp_isEqual(void *rcv, SEL sel, void *obj) { - if (obj == NULL) + if (obj == NULL) { return false; - - if (*(Class *)rcv == (Class)rb_cFixnum - && *(Class *)obj == (Class)rb_cFixnum) { - /* XXX check if Numeric#== is not overriden */ - return RFIXNUM(rcv)->value == RFIXNUM(obj)->value; } - VALUE arg = OC2RB(obj); return rb_vm_call((VALUE)rcv, selEq, 1, &arg, false) == Qtrue; } Modified: MacRuby/trunk/include/ruby/ruby.h =================================================================== --- MacRuby/trunk/include/ruby/ruby.h 2010-03-13 03:27:20 UTC (rev 3752) +++ MacRuby/trunk/include/ruby/ruby.h 2010-03-13 03:57:05 UTC (rev 3753) @@ -551,34 +551,10 @@ void rb_class_ivar_set_dict(VALUE, CFMutableDictionaryRef); #endif -struct RFloat { - struct RBasic basic; - double float_value; -}; - -static inline double -__rb_float_value(VALUE v) -{ - return FIXFLOAT_P(v) ? FIXFLOAT2DBL(v) : ((struct RFloat *)v)->float_value; -} -#define RFLOAT_VALUE(v) (__rb_float_value((VALUE)v)) +#define RFLOAT_VALUE(v) FIXFLOAT2DBL(v) #define DOUBLE2NUM(dbl) rb_float_new(dbl) #define DBL2NUM DOUBLE2NUM -#if WITH_OBJC -struct RFixnum { - VALUE klass; - long value; -}; - -struct RSymbol { - VALUE klass; - char *str; - unsigned int len; - ID id; -}; -#endif - #define ELTS_SHARED FL_USER2 #if !WITH_OBJC @@ -768,10 +744,6 @@ #define R_CAST(st) (struct st*) #define RBASIC(obj) (R_CAST(RBasic)(obj)) #define ROBJECT(obj) (R_CAST(RObject)(obj)) -#define RFLOAT(obj) (R_CAST(RFloat)(obj)) -#if WITH_OBJC -# define RFIXNUM(obj) (R_CAST(RFixnum)(obj)) -#endif #define RDATA(obj) (R_CAST(RData)(obj)) #define RSTRUCT(obj) (R_CAST(RStruct)(obj)) #define RBIGNUM(obj) (R_CAST(RBignum)(obj)) Modified: MacRuby/trunk/numeric.c =================================================================== --- MacRuby/trunk/numeric.c 2010-03-13 03:27:20 UTC (rev 3752) +++ MacRuby/trunk/numeric.c 2010-03-13 03:57:05 UTC (rev 3753) @@ -93,15 +93,12 @@ VALUE rb_eZeroDivError; VALUE rb_eFloatDomainError; -static CFMutableDictionaryRef fixnum_cache = NULL; - -static inline VALUE -rb_box_fixfloat0(double v) +static VALUE +rb_box_fixfloat0(double value) { - NEWOBJ(val, struct RFloat); - OBJSETUP(val, rb_cFloat, T_FLOAT); - val->float_value = v; - return (VALUE)val; + CFNumberRef number = CFNumberCreate(NULL, kCFNumberDoubleType, &value); + CFMakeCollectable(number); + return (VALUE)number; } VALUE @@ -110,25 +107,12 @@ return rb_box_fixfloat0(NUM2DBL(fixfloat)); } -static inline VALUE +static VALUE rb_box_fixnum0(long value) { - if (fixnum_cache == NULL) { - fixnum_cache = CFDictionaryCreateMutable(NULL, 0, NULL, - &kCFTypeDictionaryValueCallBacks); - } - - struct RFixnum *val = (struct RFixnum *)CFDictionaryGetValue(fixnum_cache, - (const void *)value); - if (val == NULL) { - NEWOBJ(fixval, struct RFixnum); - fixval->klass = rb_cFixnum; - fixval->value = value; - val = fixval; - CFDictionarySetValue(fixnum_cache, (const void *)value, val); - } - - return (VALUE)val; + CFNumberRef number = CFNumberCreate(NULL, kCFNumberLongType, &value); + CFMakeCollectable(number); + return (VALUE)number; } VALUE @@ -3298,58 +3282,6 @@ return Qtrue; } -static VALUE -imp_rb_float_copyWithZone(void *rcv, SEL sel, void *zone) -{ - // XXX honor zone? - return rb_box_fixfloat0(RFLOAT_VALUE(rcv)); -} - -static VALUE -imp_rb_fixnum_copyWithZone(void *rcv, SEL sel, void *zone) -{ - // XXX honor zone? - return rb_box_fixnum0(RFIXNUM(rcv)->value); -} - -static const char * -imp_rb_float_objCType(void *rcv, SEL sel) -{ - return "d"; -} - -static const char * -imp_rb_fixnum_objCType(void *rcv, SEL sel) -{ - return "l"; -} - -static void -imp_rb_float_getValue(void *rcv, SEL sel, void *buffer) -{ - double v = RFLOAT_VALUE(rcv); - *(double *)buffer = v; -} - -static void -imp_rb_fixnum_getValue(void *rcv, SEL sel, void *buffer) -{ - long v = RFIXNUM(rcv)->value; - *(long *)buffer = v; -} - -static double -imp_rb_float_doubleValue(void *rcv, SEL sel) -{ - return RFLOAT_VALUE(rcv); -} - -static long long -imp_rb_fixnum_longValue(void *rcv, SEL sel) -{ - return RFIXNUM(rcv)->value; -} - static void * imp_nsnumber_to_int(void *rcv, SEL sel) { @@ -3365,37 +3297,6 @@ return (void *)new_num; } -static void -rb_install_nsnumber_primitives(void) -{ - Class klass; - - klass = (Class)rb_cFloat; - rb_objc_install_method2(klass, "copyWithZone:", - (IMP)imp_rb_float_copyWithZone); - rb_objc_install_method2(klass, "objCType", (IMP)imp_rb_float_objCType); - rb_objc_install_method2(klass, "getValue:", (IMP)imp_rb_float_getValue); - rb_objc_install_method2(klass, "doubleValue", - (IMP)imp_rb_float_doubleValue); - - klass = (Class)rb_cFixnum; - rb_objc_install_method2(klass, "copyWithZone:", - (IMP)imp_rb_fixnum_copyWithZone); - rb_objc_install_method2(klass, "objCType", (IMP)imp_rb_fixnum_objCType); - rb_objc_install_method2(klass, "getValue:", (IMP)imp_rb_fixnum_getValue); - rb_objc_install_method2(klass, "longValue", (IMP)imp_rb_fixnum_longValue); - - klass = (Class)rb_cNSNumber; - class_replaceMethod(klass, sel_registerName("to_int"), - (IMP)imp_nsnumber_to_int, "@@:"); -} - -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070 -# define NSCFNUMBER_CNAME "NSCFNumber" -#else -# define NSCFNUMBER_CNAME "__NSCFNumber" -#endif - void Init_Numeric(void) { @@ -3577,6 +3478,7 @@ rb_objc_define_method(rb_cFloat, "nan?", flo_is_nan_p, 0); rb_objc_define_method(rb_cFloat, "infinite?", flo_is_infinite_p, 0); rb_objc_define_method(rb_cFloat, "finite?", flo_is_finite_p, 0); - - rb_install_nsnumber_primitives(); + + class_replaceMethod((Class)rb_cNSNumber, sel_registerName("to_int"), + (IMP)imp_nsnumber_to_int, "@@:"); }

1 0

[3752] MacRuby/trunk
by source_changes＠macosforge.org 13 Mar '10

13 Mar '10

Revision: 3752 http://trac.macosforge.org/projects/ruby/changeset/3752 Author: lsansonetti(a)apple.com Date: 2010-03-12 19:27:20 -0800 (Fri, 12 Mar 2010) Log Message: ----------- support for objc immediates, removed reference to CFNumber Modified Paths: -------------- MacRuby/trunk/include/ruby/ruby.h MacRuby/trunk/numeric.c MacRuby/trunk/objc.h Modified: MacRuby/trunk/include/ruby/ruby.h =================================================================== --- MacRuby/trunk/include/ruby/ruby.h 2010-03-13 03:26:45 UTC (rev 3751) +++ MacRuby/trunk/include/ruby/ruby.h 2010-03-13 03:27:20 UTC (rev 3752) @@ -1092,7 +1092,7 @@ RUBY_EXTERN VALUE rb_cNSHash; RUBY_EXTERN VALUE rb_cNSMutableHash; RUBY_EXTERN VALUE rb_cRubyHash; -RUBY_EXTERN VALUE rb_cCFNumber; +RUBY_EXTERN VALUE rb_cNSNumber; RUBY_EXTERN VALUE rb_cBoxed; RUBY_EXTERN VALUE rb_cPointer; RUBY_EXTERN VALUE rb_cTopLevel; Modified: MacRuby/trunk/numeric.c =================================================================== --- MacRuby/trunk/numeric.c 2010-03-13 03:26:45 UTC (rev 3751) +++ MacRuby/trunk/numeric.c 2010-03-13 03:27:20 UTC (rev 3752) @@ -85,7 +85,6 @@ static ID id_to_i, id_eq; VALUE rb_cNumeric; -VALUE rb_cCFNumber; VALUE rb_cNSNumber; VALUE rb_cFloat; VALUE rb_cInteger; @@ -3411,8 +3410,6 @@ rb_eZeroDivError = rb_define_class("ZeroDivisionError", rb_eStandardError); rb_eFloatDomainError = rb_define_class("FloatDomainError", rb_eRangeError); rb_cNSNumber = (VALUE)objc_getClass("NSNumber"); - rb_cCFNumber = (VALUE)objc_getClass(NSCFNUMBER_CNAME); - assert(rb_cCFNumber != 0); rb_cNumeric = rb_define_class("Numeric", rb_cNSNumber); RCLASS_SET_VERSION_FLAG(rb_cNumeric, RCLASS_IS_OBJECT_SUBCLASS); rb_define_object_special_methods(rb_cNumeric); Modified: MacRuby/trunk/objc.h =================================================================== --- MacRuby/trunk/objc.h 2010-03-13 03:26:45 UTC (rev 3751) +++ MacRuby/trunk/objc.h 2010-03-13 03:27:20 UTC (rev 3752) @@ -205,28 +205,28 @@ if (obj == (id)kCFNull || obj == nil) { return Qnil; } - if (*(Class *)obj == (Class)rb_cFixnum) { - return LONG2FIX(RFIXNUM(obj)->value); - } -#if 0 // XXX this does not seem to be needed - if (*(Class *)obj == (Class)rb_cFloat) { - extern VALUE rb_float_new(double); - return rb_float_new(RFLOAT(obj)->float_value); - } -#endif - if (*(Class *)obj == (Class)rb_cCFNumber) { - /* TODO NSNumber should implement the Numeric primitive methods */ - if (CFNumberIsFloatType((CFNumberRef)obj)) { - double v; - assert(CFNumberGetValue((CFNumberRef)obj, kCFNumberDoubleType, &v)); - extern VALUE rb_float_new(double); - return rb_float_new(v); + if (((unsigned long)obj & 0x1) == 0x1) { + // An Objective-C immediate! We only recognize NSNumbers for now. + Class k = object_getClass(obj); + while (k != NULL) { + if (k == (Class)rb_cNSNumber) { + if (CFNumberIsFloatType((CFNumberRef)obj)) { + // Will likely not happen, but just in case... + double v; + assert(CFNumberGetValue((CFNumberRef)obj, + kCFNumberDoubleType, &v)); + return DOUBLE2NUM(v); + } + else { + long v; + assert(CFNumberGetValue((CFNumberRef)obj, + kCFNumberLongType, &v)); + return LONG2FIX(v); + } + } + k = class_getSuperclass(k); } - else { - long v; - assert(CFNumberGetValue((CFNumberRef)obj, kCFNumberLongType, &v)); - return LONG2FIX(v); - } + rb_bug("unknown Objective-C immediate: %p\n", obj); } return (VALUE)obj; }

1 0

[3751] MacRuby/trunk/re.cpp
by source_changes＠macosforge.org 13 Mar '10

13 Mar '10

Revision: 3751 http://trac.macosforge.org/projects/ruby/changeset/3751 Author: lsansonetti(a)apple.com Date: 2010-03-12 19:26:45 -0800 (Fri, 12 Mar 2010) Log Message: ----------- print the regexp that could not be compiled in the exception Modified Paths: -------------- MacRuby/trunk/re.cpp Modified: MacRuby/trunk/re.cpp =================================================================== --- MacRuby/trunk/re.cpp 2010-03-13 03:14:38 UTC (rev 3750) +++ MacRuby/trunk/re.cpp 2010-03-13 03:26:45 UTC (rev 3751) @@ -140,7 +140,8 @@ delete unistr; if (excp != NULL) { char error[1024]; - snprintf(error, sizeof error, "regexp compilation error: %s", + snprintf(error, sizeof error, "regexp `%s 'compilation error: %s", + RSTRING_PTR(str), u_errorName(status)); *excp = rb_exc_new2(rb_eRegexpError, error); }

1 0

[3750] MacRuby/trunk/spec/macruby/core/struct_spec.rb
by source_changes＠macosforge.org 13 Mar '10

13 Mar '10

Revision: 3750 http://trac.macosforge.org/projects/ruby/changeset/3750 Author: lsansonetti(a)apple.com Date: 2010-03-12 19:14:38 -0800 (Fri, 12 Mar 2010) Log Message: ----------- fix class names on the bleeding edge Modified Paths: -------------- MacRuby/trunk/spec/macruby/core/struct_spec.rb Modified: MacRuby/trunk/spec/macruby/core/struct_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/struct_spec.rb 2010-03-13 02:09:56 UTC (rev 3749) +++ MacRuby/trunk/spec/macruby/core/struct_spec.rb 2010-03-13 03:14:38 UTC (rev 3750) @@ -143,15 +143,9 @@ NSPoint.new.should_not == NSSize.new end - if MACOSX_VERSION <= 10.6 - NSPOINT_CNAME = 'CGPoint' - NSSIZE_CNAME = 'CGSize' - NSRECT_CNAME = 'CGRect' - else - NSPOINT_CNAME = 'NSPoint' - NSSIZE_CNAME = 'NSSize' - NSRECT_CNAME = 'NSRect' - end + NSPOINT_CNAME = 'CGPoint' + NSSIZE_CNAME = 'CGSize' + NSRECT_CNAME = 'CGRect' it "has a nice #inspect message that lists the fields" do p = NSPoint.new

1 0