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

[2865] MacRuby/trunk/bridgesupport.cpp
by source_changes＠macosforge.org 20 Oct '09

20 Oct '09

Revision: 2865 http://trac.macosforge.org/projects/ruby/changeset/2865 Author: lsansonetti(a)apple.com Date: 2009-10-20 00:00:25 -0700 (Tue, 20 Oct 2009) Log Message: ----------- working missing 64-bit informa protocol annotations with NSRange Modified Paths: -------------- MacRuby/trunk/bridgesupport.cpp Modified: MacRuby/trunk/bridgesupport.cpp =================================================================== --- MacRuby/trunk/bridgesupport.cpp 2009-10-20 03:36:35 UTC (rev 2864) +++ MacRuby/trunk/bridgesupport.cpp 2009-10-20 07:00:25 UTC (rev 2865) @@ -1012,6 +1012,9 @@ else if (strncmp(p, "{_NSRect=", 9) == 0) { strlcat(type, "{CGRect={CGPoint=dd}{CGSize=dd}}", typelen); } + else if (strncmp(p, "{_NSRange=", 10) == 0) { + strlcat(type, "{_NSRange=QQ}", typelen); + } else { char buf[100]; strncpy(buf, p, len);

1 0

[2864] MacRuby/trunk
by source_changes＠macosforge.org 20 Oct '09

20 Oct '09

Revision: 2864 http://trac.macosforge.org/projects/ruby/changeset/2864 Author: neeracher(a)apple.com Date: 2009-10-19 20:36:35 -0700 (Mon, 19 Oct 2009) Log Message: ----------- Safe quoting of plain string scalars that look like non-strings Modified Paths: -------------- MacRuby/trunk/ext/libyaml/rubyext.c MacRuby/trunk/lib/yaml/rubytypes.rb Modified: MacRuby/trunk/ext/libyaml/rubyext.c =================================================================== --- MacRuby/trunk/ext/libyaml/rubyext.c 2009-10-20 03:29:23 UTC (rev 2863) +++ MacRuby/trunk/ext/libyaml/rubyext.c 2009-10-20 03:36:35 UTC (rev 2864) @@ -359,34 +359,40 @@ return true; } +static char * +detect_scalar_type(const char * val, size_t length) +{ + bool has_point = false; + if (length == 0) { + return "tag:yaml.org,2002:null"; + } + else if (*val == ':') { + return "tag:ruby.yaml.org,2002:symbol"; + } + else if (is_numeric(val, &has_point)) { + return has_point + ? "tag:yaml.org,2002:float" + : "tag:yaml.org,2002:int"; + } + else if (strcmp(val, "true") == 0) { + return "tag:yaml.org,2002:true"; + } + else if (strcmp(val, "false") == 0) { + return "tag:yaml.org,2002:false"; + } + else { + return NULL; + } +} + static VALUE handle_scalar(rb_yaml_parser_t *parser) { char *val = (char*)parser->event.data.scalar.value; char *tag = (char*)parser->event.data.scalar.tag; - bool has_point = false; if (parser->event.data.scalar.style == YAML_PLAIN_SCALAR_STYLE && tag == NULL) { - if (parser->event.data.scalar.length == 0) { - tag = "tag:yaml.org,2002:null"; - } - else if (*val == ':') { - tag = "tag:ruby.yaml.org,2002:symbol"; - } - else if (is_numeric(val, &has_point)) { - tag = has_point - ? "tag:yaml.org,2002:float" - : "tag:yaml.org,2002:int"; - } - else if (strcmp(val, "true") == 0) { - tag = "tag:yaml.org,2002:true"; - } - else if (strcmp(val, "false") == 0) { - tag = "tag:yaml.org,2002:false"; - } - else { - tag = "tag:yaml.org,2002:str"; - } + tag = detect_scalar_type(val, parser->event.data.scalar.length); } if (tag == NULL) { tag = "tag:yaml.org,2002:str"; @@ -555,17 +561,21 @@ } static yaml_char_t* -rb_yaml_tag_or_null(VALUE tagstr, int *can_omit_tag) +rb_yaml_tag_or_null(VALUE tagstr, int *can_omit_tag, int * string_tag) { // TODO make this part of the resolver chain; this is the wrong place for it const char *tag = RSTRING_PTR(tagstr); - if ((strcmp(tag, "tag:yaml.org,2002:int") == 0) || + if (strcmp(tag, "tag:yaml.org,2002:str") == 0) { + *can_omit_tag = 1; + *string_tag = 1; + return NULL; + } + else if ((strcmp(tag, "tag:yaml.org,2002:int") == 0) || (strcmp(tag, "tag:yaml.org,2002:float") == 0) || (strcmp(tag, "tag:ruby.yaml.org,2002:symbol") == 0) || (strcmp(tag, "tag:yaml.org,2002:true") == 0) || (strcmp(tag, "tag:yaml.org,2002:false") == 0) || (strcmp(tag, "tag:yaml.org,2002:null") == 0) || - (strcmp(tag, "tag:yaml.org,2002:str") == 0) || (strcmp(tag, YAML_DEFAULT_SEQUENCE_TAG) == 0) || (strcmp(tag, YAML_DEFAULT_MAPPING_TAG) == 0)) { *can_omit_tag = 1; @@ -688,7 +698,8 @@ yaml_emitter_t *emitter = &RYAMLEmitter(self)->emitter; int can_omit_tag = 0; - yaml_char_t *tag = rb_yaml_tag_or_null(taguri, &can_omit_tag); + int string_tag = 0; + yaml_char_t *tag = rb_yaml_tag_or_null(taguri, &can_omit_tag, &string_tag); yaml_sequence_start_event_initialize(&ev, NULL, tag, can_omit_tag, rb_symbol_to_sequence_style(style)); yaml_emitter_emit(emitter, &ev); @@ -707,7 +718,8 @@ yaml_emitter_t *emitter = &RYAMLEmitter(self)->emitter; int can_omit_tag = 0; - yaml_char_t *tag = rb_yaml_tag_or_null(taguri, &can_omit_tag); + int string_tag = 0; + yaml_char_t *tag = rb_yaml_tag_or_null(taguri, &can_omit_tag, &string_tag); yaml_mapping_start_event_initialize(&ev, NULL, tag, can_omit_tag, rb_symbol_to_mapping_style(style)); yaml_emitter_emit(emitter, &ev); @@ -726,11 +738,21 @@ yaml_event_t ev; yaml_emitter_t *emitter = &RYAMLEmitter(self)->emitter; yaml_char_t *output = (yaml_char_t *)RSTRING_PTR(val); + size_t length = strlen((const char *)output); int can_omit_tag = 0; - yaml_char_t *tag = rb_yaml_tag_or_null(taguri, &can_omit_tag); - yaml_scalar_event_initialize(&ev, NULL, tag, output, strlen((const char *)output), - can_omit_tag, can_omit_tag, rb_symbol_to_scalar_style(style)); + int string_tag = 0; + yaml_char_t *tag = rb_yaml_tag_or_null(taguri, &can_omit_tag, &string_tag); + yaml_scalar_style_t sstyl = rb_symbol_to_scalar_style(style); + if (string_tag && + (sstyl==YAML_ANY_SCALAR_STYLE || sstyl==YAML_PLAIN_SCALAR_STYLE) && + (detect_scalar_type((const char *)output, length) != NULL) + ) { + /* Quote so this is read back as a string, no matter what type it looks like */ + sstyl = YAML_DOUBLE_QUOTED_SCALAR_STYLE; + } + yaml_scalar_event_initialize(&ev, NULL, tag, output, length, + can_omit_tag, can_omit_tag, sstyl); yaml_emitter_emit(emitter, &ev); return self; Modified: MacRuby/trunk/lib/yaml/rubytypes.rb =================================================================== --- MacRuby/trunk/lib/yaml/rubytypes.rb 2009-10-20 03:29:23 UTC (rev 2863) +++ MacRuby/trunk/lib/yaml/rubytypes.rb 2009-10-20 03:36:35 UTC (rev 2864) @@ -63,7 +63,7 @@ def to_yaml(output = nil) YAML::quick_emit(output) do |out| - out.scalar(taguri, self, self =~ /^:/ ? :quote2 : nil) + out.scalar(taguri, self, to_yaml_style) end end

1 0

[2863] MacRuby/trunk/vm.cpp
by source_changes＠macosforge.org 20 Oct '09

20 Oct '09

Revision: 2863 http://trac.macosforge.org/projects/ruby/changeset/2863 Author: lsansonetti(a)apple.com Date: 2009-10-19 20:29:23 -0700 (Mon, 19 Oct 2009) Log Message: ----------- when generating the default objc runtime signature for a pure ruby method, if it starts by 'set' let's use 'void' instead of 'id' Modified Paths: -------------- MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2009-10-20 03:16:06 UTC (rev 2862) +++ MacRuby/trunk/vm.cpp 2009-10-20 03:29:23 UTC (rev 2863) @@ -1505,8 +1505,11 @@ strncpy(buf, informal_type->c_str(), buflen); } else { + // Generate an automatic signature, using 'id' (@) for all + // arguments. If the method name starts by 'set', we use 'void' + // (v) for the return value, otherwise we use 'id' (@). assert(oc_arity < buflen); - buf[0] = '@'; + buf[0] = strncmp(sel_getName(sel), "set", 3) == 0 ? 'v' : '@'; buf[1] = '@'; buf[2] = ':'; for (unsigned int i = 3; i < oc_arity; i++) {

1 0

[2862] MacRuby/trunk/variable.c
by source_changes＠macosforge.org 20 Oct '09

20 Oct '09

Revision: 2862 http://trac.macosforge.org/projects/ruby/changeset/2862 Author: lsansonetti(a)apple.com Date: 2009-10-19 20:16:06 -0700 (Mon, 19 Oct 2009) Log Message: ----------- always set the outer of a class to something Modified Paths: -------------- MacRuby/trunk/variable.c Modified: MacRuby/trunk/variable.c =================================================================== --- MacRuby/trunk/variable.c 2009-10-20 03:15:43 UTC (rev 2861) +++ MacRuby/trunk/variable.c 2009-10-20 03:16:06 UTC (rev 2862) @@ -274,9 +274,7 @@ OBJ_FREEZE(str); rb_ivar_set(klass, classpath, str); - if (set_outer) { - rb_vm_set_outer(klass, under); - } + rb_vm_set_outer(klass, set_outer ? under : rb_cObject); } void

1 0

[2861] MacRuby/trunk
by source_changes＠macosforge.org 20 Oct '09

20 Oct '09

Revision: 2861 http://trac.macosforge.org/projects/ruby/changeset/2861 Author: lsansonetti(a)apple.com Date: 2009-10-19 20:15:43 -0700 (Mon, 19 Oct 2009) Log Message: ----------- move some non-critical code out of vm.h Modified Paths: -------------- MacRuby/trunk/vm.cpp MacRuby/trunk/vm.h Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2009-10-19 23:44:00 UTC (rev 2860) +++ MacRuby/trunk/vm.cpp 2009-10-20 03:15:43 UTC (rev 2861) @@ -1088,10 +1088,39 @@ GET_CORE()->const_defined(path); } +struct rb_vm_outer * +RoxorCore::get_outer(Class klass) +{ + std::map<Class, struct rb_vm_outer *>::iterator iter = + outers.find(klass); + return iter == outers.end() ? NULL : iter->second; +} + +void +RoxorCore::set_outer(Class klass, Class mod) +{ + struct rb_vm_outer *mod_outer = get_outer(mod); + struct rb_vm_outer *class_outer = get_outer(klass); + if (class_outer == NULL || class_outer->outer != mod_outer) { + if (class_outer != NULL) { + free(class_outer); + } + class_outer = (struct rb_vm_outer *) + malloc(sizeof(struct rb_vm_outer)); + class_outer->klass = klass; + class_outer->outer = mod_outer; + outers[klass] = class_outer; + } +} + extern "C" void rb_vm_set_outer(VALUE klass, VALUE under) { +#if ROXOR_VM_DEBUG + printf("set outer of %s to %s\n", class_getName((Class)klass), + class_getName((Class)under)); +#endif GET_CORE()->set_outer((Class)klass, (Class)under); } Modified: MacRuby/trunk/vm.h =================================================================== --- MacRuby/trunk/vm.h 2009-10-19 23:44:00 UTC (rev 2860) +++ MacRuby/trunk/vm.h 2009-10-20 03:15:43 UTC (rev 2861) @@ -736,27 +736,9 @@ void each_ivar_slot(VALUE obj, int (*func)(ANYARGS), void *ctx); bool class_can_have_ivar_slots(VALUE klass); - struct rb_vm_outer *get_outer(Class klass) { - std::map<Class, struct rb_vm_outer *>::iterator iter = - outers.find(klass); - return iter == outers.end() ? NULL : iter->second; - } + struct rb_vm_outer *get_outer(Class klass); + void set_outer(Class klass, Class mod); - void set_outer(Class klass, Class mod) { - struct rb_vm_outer *mod_outer = get_outer(mod); - struct rb_vm_outer *class_outer = get_outer(klass); - if (class_outer == NULL || class_outer->outer != mod_outer) { - if (class_outer != NULL) { - free(class_outer); - } - class_outer = (struct rb_vm_outer *) - malloc(sizeof(struct rb_vm_outer)); - class_outer->klass = klass; - class_outer->outer = mod_outer; - outers[klass] = class_outer; - } - } - size_t get_sizeof(const Type *type); size_t get_sizeof(const char *type); bool is_large_struct_type(const Type *type);

1 0

[2860] MacRuby/trunk/version.h
by source_changes＠macosforge.org 19 Oct '09

19 Oct '09

Revision: 2860 http://trac.macosforge.org/projects/ruby/changeset/2860 Author: lsansonetti(a)apple.com Date: 2009-10-19 16:44:00 -0700 (Mon, 19 Oct 2009) Log Message: ----------- better description Modified Paths: -------------- MacRuby/trunk/version.h Modified: MacRuby/trunk/version.h =================================================================== --- MacRuby/trunk/version.h 2009-10-19 23:39:05 UTC (rev 2859) +++ MacRuby/trunk/version.h 2009-10-19 23:44:00 UTC (rev 2860) @@ -58,7 +58,7 @@ #endif #define RUBY_DESCRIPTION \ - "MacRuby version " STRINGIZE(MACRUBY_VERSION) \ + "MacRuby version " MACRUBY_VERSION \ " (ruby "RUBY_VERSION \ ") ["RUBY_PLATFORM", "RUBY_ARCH"]"

1 0

[2859] MacRuby/trunk/rakelib/builder.rb
by source_changes＠macosforge.org 19 Oct '09

19 Oct '09

Revision: 2859 http://trac.macosforge.org/projects/ruby/changeset/2859 Author: lsansonetti(a)apple.com Date: 2009-10-19 16:39:05 -0700 (Mon, 19 Oct 2009) Log Message: ----------- don't define MACRUBY_VERSION if it's already there (we may run under macrake) Modified Paths: -------------- MacRuby/trunk/rakelib/builder.rb Modified: MacRuby/trunk/rakelib/builder.rb =================================================================== --- MacRuby/trunk/rakelib/builder.rb 2009-10-19 23:38:40 UTC (rev 2858) +++ MacRuby/trunk/rakelib/builder.rb 2009-10-19 23:39:05 UTC (rev 2859) @@ -61,7 +61,9 @@ version_h = File.read('version.h') NEW_RUBY_VERSION = version_h.scan(/#\s*define\s+RUBY_VERSION\s+\"([^"]+)\"/)[0][0] -MACRUBY_VERSION = version_h.scan(/#\s*define\s+MACRUBY_VERSION\s+(.*)/)[0][0] +unless defined?(MACRUBY_VERSION) + MACRUBY_VERSION = version_h.scan(/#\s*define\s+MACRUBY_VERSION\s+\"(.*)\"/)[0][0] +end uname_release_number = (ENV['UNAME_RELEASE'] or `uname -r`.scan(/^(\d+)\.\d+\.(\d+)/)[0].join('.')) NEW_RUBY_PLATFORM = 'universal-darwin' + uname_release_number

1 0

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

19 Oct '09

Revision: 2858 http://trac.macosforge.org/projects/ruby/changeset/2858 Author: lsansonetti(a)apple.com Date: 2009-10-19 16:38:40 -0700 (Mon, 19 Oct 2009) Log Message: ----------- MACRUBY_VERSION is now a string Modified Paths: -------------- MacRuby/trunk/version.c MacRuby/trunk/version.h Modified: MacRuby/trunk/version.c =================================================================== --- MacRuby/trunk/version.c 2009-10-19 23:37:04 UTC (rev 2857) +++ MacRuby/trunk/version.c 2009-10-19 23:38:40 UTC (rev 2858) @@ -39,7 +39,7 @@ rb_define_global_const("RUBY_ENGINE", MKSTR(engine)); #if WITH_OBJC rb_define_global_const("RUBY_ARCH", rb_str_new2(RUBY_ARCH)); - rb_define_global_const("MACRUBY_VERSION", rb_float_new(MACRUBY_VERSION)); + rb_define_global_const("MACRUBY_VERSION", rb_str_new2(MACRUBY_VERSION)); rb_define_global_const("MACRUBY_REVISION", rb_str_new2(MACRUBY_REVISION)); #endif } Modified: MacRuby/trunk/version.h =================================================================== --- MacRuby/trunk/version.h 2009-10-19 23:37:04 UTC (rev 2857) +++ MacRuby/trunk/version.h 2009-10-19 23:38:40 UTC (rev 2858) @@ -1,5 +1,5 @@ #define RUBY_ENGINE "macruby" -#define MACRUBY_VERSION 0.5 +#define MACRUBY_VERSION "0.5" #define RUBY_VERSION "1.9.0" #define RUBY_RELEASE_DATE "2008-06-03"

1 0

[2857] MacRuby/trunk/spec/frozen/tags/macruby/core/module/ remove_method_tags.txt
by source_changes＠macosforge.org 19 Oct '09

19 Oct '09

Revision: 2857 http://trac.macosforge.org/projects/ruby/changeset/2857 Author: eloy.de.enige(a)gmail.com Date: 2009-10-19 16:37:04 -0700 (Mon, 19 Oct 2009) Log Message: ----------- Remove passing remove_method tag. Modified Paths: -------------- MacRuby/trunk/spec/frozen/tags/macruby/core/module/remove_method_tags.txt Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/module/remove_method_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/module/remove_method_tags.txt 2009-10-19 23:36:53 UTC (rev 2856) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/module/remove_method_tags.txt 2009-10-19 23:37:04 UTC (rev 2857) @@ -1,3 +1,2 @@ -fails:Module#remove_method removes the method from a class fails:Module#remove_method removes method from subclass, but not parent fails:Module#remove_method raises a NameError when attempting to remove method further up the inheritance tree

1 0

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

19 Oct '09

Revision: 2856 http://trac.macosforge.org/projects/ruby/changeset/2856 Author: eloy.de.enige(a)gmail.com Date: 2009-10-19 16:36:53 -0700 (Mon, 19 Oct 2009) Log Message: ----------- When looking up a method in the ancestor chain skip removed methods. Modified Paths: -------------- MacRuby/trunk/dispatcher.cpp Modified: MacRuby/trunk/dispatcher.cpp =================================================================== --- MacRuby/trunk/dispatcher.cpp 2009-10-19 23:36:46 UTC (rev 2855) +++ MacRuby/trunk/dispatcher.cpp 2009-10-19 23:36:53 UTC (rev 2856) @@ -277,8 +277,9 @@ Method method = class_getInstanceMethod((Class)k, sel); VALUE super = RCLASS_SUPER(k); - if (method == NULL || (super != 0 - && class_getInstanceMethod((Class)super, sel) == method)) { + if (method == NULL || REMOVED_IMP(method_getImplementation(method)) + || (super != 0 + && class_getInstanceMethod((Class)super, sel) == method)) { continue; }

1 0