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

[2825] MacRuby/trunk
by source_changes＠macosforge.org 16 Oct '09

16 Oct '09

Revision: 2825 http://trac.macosforge.org/projects/ruby/changeset/2825 Author: neeracher(a)apple.com Date: 2009-10-15 18:30:42 -0700 (Thu, 15 Oct 2009) Log Message: ----------- Handle UTF-16 encoded strings passed to YAML Modified Paths: -------------- MacRuby/trunk/ext/libyaml/rubyext.c MacRuby/trunk/spec/frozen/library/yaml/to_yaml_spec.rb Modified: MacRuby/trunk/ext/libyaml/rubyext.c =================================================================== --- MacRuby/trunk/ext/libyaml/rubyext.c 2009-10-16 01:27:38 UTC (rev 2824) +++ MacRuby/trunk/ext/libyaml/rubyext.c 2009-10-16 01:30:42 UTC (rev 2825) @@ -162,10 +162,10 @@ rb_bytestring_length(input)); } else if (TYPE(input) == T_STRING) { - // TODO: Make sure that this is Unicode-aware. + const char * instring = RSTRING_PTR(input); yaml_parser_set_input_string(parser, - (const unsigned char *)(RSTRING_PTR(input)), - RSTRING_LEN(input)); + (const unsigned char *)(instring), + strlen(instring)); } else if (TYPE(input) == T_FILE) { yaml_parser_set_input(parser, rb_yaml_io_read_handler, @@ -729,7 +729,7 @@ 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, RSTRING_LEN(val), + yaml_scalar_event_initialize(&ev, NULL, tag, output, strlen(output), can_omit_tag, can_omit_tag, rb_symbol_to_scalar_style(style)); yaml_emitter_emit(emitter, &ev); Modified: MacRuby/trunk/spec/frozen/library/yaml/to_yaml_spec.rb =================================================================== --- MacRuby/trunk/spec/frozen/library/yaml/to_yaml_spec.rb 2009-10-16 01:27:38 UTC (rev 2824) +++ MacRuby/trunk/spec/frozen/library/yaml/to_yaml_spec.rb 2009-10-16 01:30:42 UTC (rev 2825) @@ -53,6 +53,14 @@ "I love Ruby".to_yaml.should == "--- I love Ruby\n" end + it "returns correct escape characters for non-ASCII Unicode characters" do + # + # Not sure if this belongs here? MN + # + str = YAML.load('--- "\U000000A9\U00002117\U0001D122"') + str.to_yaml.chomp.should == '--- "\xA9\u2117\U0001D122"' + end + it "returns the YAML representation of a Struct object" do Person = Struct.new(:name, :gender) Person.new("Jane", "female").to_yaml.should match_yaml("--- !ruby/struct:Person\nname: Jane\ngender: female\n")

1 0

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

16 Oct '09

Revision: 2824 http://trac.macosforge.org/projects/ruby/changeset/2824 Author: neeracher(a)apple.com Date: 2009-10-15 18:27:38 -0700 (Thu, 15 Oct 2009) Log Message: ----------- Fix style of NULL test Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2009-10-16 01:24:02 UTC (rev 2823) +++ MacRuby/trunk/string.c 2009-10-16 01:27:38 UTC (rev 2824) @@ -5290,7 +5290,7 @@ { bool flag; PREPARE_RCV(rcv); - flag = other && CFEqual((CFTypeRef)rcv, (CFTypeRef)other); + flag = (other != NULL) && CFEqual((CFTypeRef)rcv, (CFTypeRef)other); RESTORE_RCV(rcv); return flag; }

1 0

[2823] MacRuby/trunk/spec/macruby/core/pointer_spec.rb
by source_changes＠macosforge.org 16 Oct '09

16 Oct '09

Revision: 2823 http://trac.macosforge.org/projects/ruby/changeset/2823 Author: lsansonetti(a)apple.com Date: 2009-10-15 18:24:02 -0700 (Thu, 15 Oct 2009) Log Message: ----------- added a Pointer + CF type spec Modified Paths: -------------- MacRuby/trunk/spec/macruby/core/pointer_spec.rb Modified: MacRuby/trunk/spec/macruby/core/pointer_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/pointer_spec.rb 2009-10-16 01:23:45 UTC (rev 2822) +++ MacRuby/trunk/spec/macruby/core/pointer_spec.rb 2009-10-16 01:24:02 UTC (rev 2823) @@ -111,4 +111,11 @@ lambda { pointer[0] = Object.new }.should raise_error(TypeError) end end + + it "can assign an retrieve CF type objects" do + ptr = Pointer.new('^{__CFError}') + ptr[0].should == nil + CFURLResourceIsReachable(NSURL.URLWithString('http://doesnotexistomgwtf.be'), ptr).should == false + ptr[0].class.should == NSCFError + end end

1 0

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

16 Oct '09

Revision: 2822 http://trac.macosforge.org/projects/ruby/changeset/2822 Author: lsansonetti(a)apple.com Date: 2009-10-15 18:23:45 -0700 (Thu, 15 Oct 2009) Log Message: ----------- for a given CF type signature, also register an equivalent without the '=' character to conform to BridgeSupport APIs returning this type by reference Modified Paths: -------------- MacRuby/trunk/bridgesupport.cpp Modified: MacRuby/trunk/bridgesupport.cpp =================================================================== --- MacRuby/trunk/bridgesupport.cpp 2009-10-16 01:22:43 UTC (rev 2821) +++ MacRuby/trunk/bridgesupport.cpp 2009-10-16 01:23:45 UTC (rev 2822) @@ -1035,7 +1035,16 @@ std::map<std::string, bs_element_cftype_t *>::iterator iter = bs_cftypes.find(bs_cftype->type); if (iter == bs_cftypes.end()) { - bs_cftypes[bs_cftype->type] = bs_cftype; + std::string s(bs_cftype->type); + bs_cftypes[s] = bs_cftype; + if (s.compare(s.size() - 2, 2, "=}") == 0) { + // For ^{__CFError=}, also registering ^{__CFError}. + // This is because functions or methods returning CF types + // by reference strangely omit the '=' character as part + // of their BridgeSupport signature. + s.replace(s.size() - 2, 2, "}"); + bs_cftypes[s] = bs_cftype; + } do_not_free = true; } else {

1 0

[2821] MacRuby/trunk/spec/frozen/core/array/to_s_spec.rb
by source_changes＠macosforge.org 16 Oct '09

16 Oct '09

Revision: 2821 http://trac.macosforge.org/projects/ruby/changeset/2821 Author: lsansonetti(a)apple.com Date: 2009-10-15 18:22:43 -0700 (Thu, 15 Oct 2009) Log Message: ----------- fixed a typo Modified Paths: -------------- MacRuby/trunk/spec/frozen/core/array/to_s_spec.rb Modified: MacRuby/trunk/spec/frozen/core/array/to_s_spec.rb =================================================================== --- MacRuby/trunk/spec/frozen/core/array/to_s_spec.rb 2009-10-16 00:51:02 UTC (rev 2820) +++ MacRuby/trunk/spec/frozen/core/array/to_s_spec.rb 2009-10-16 01:22:43 UTC (rev 2821) @@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/fixtures/classes' describe "Array#to_s" do - ruby_version_is "" .. "1.9" do + ruby_version_is "" ... "1.9" do it "is equivalent to #join without a separator string" do old = $, begin

1 0

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

16 Oct '09

Revision: 2820 http://trac.macosforge.org/projects/ruby/changeset/2820 Author: lsansonetti(a)apple.com Date: 2009-10-15 17:51:02 -0700 (Thu, 15 Oct 2009) Log Message: ----------- fixed an exception message Modified Paths: -------------- MacRuby/trunk/bridgesupport.cpp Modified: MacRuby/trunk/bridgesupport.cpp =================================================================== --- MacRuby/trunk/bridgesupport.cpp 2009-10-15 23:51:16 UTC (rev 2819) +++ MacRuby/trunk/bridgesupport.cpp 2009-10-16 00:51:02 UTC (rev 2820) @@ -651,8 +651,8 @@ if (strcmp(RSTRING_PTR(ptr->type), type + 1) != 0) { rb_raise(rb_eTypeError, "expected instance of Pointer of type `%s', got `%s'", - RSTRING_PTR(ptr->type), - type + 1); + type + 1, + RSTRING_PTR(ptr->type)); } return ptr->val;

1 0

[2819] MacRuby/trunk
by source_changes＠macosforge.org 15 Oct '09

15 Oct '09

Revision: 2819 http://trac.macosforge.org/projects/ruby/changeset/2819 Author: lsansonetti(a)apple.com Date: 2009-10-15 16:51:16 -0700 (Thu, 15 Oct 2009) Log Message: ----------- a binding created from a method with a block passed by now has a reference to the block and uses it during evaluation Modified Paths: -------------- MacRuby/trunk/proc.c MacRuby/trunk/vm.cpp MacRuby/trunk/vm.h Modified: MacRuby/trunk/proc.c =================================================================== --- MacRuby/trunk/proc.c 2009-10-15 23:50:21 UTC (rev 2818) +++ MacRuby/trunk/proc.c 2009-10-15 23:51:16 UTC (rev 2819) @@ -1391,6 +1391,7 @@ rb_vm_binding_t *binding = (rb_vm_binding_t *)xmalloc( sizeof(rb_vm_binding_t)); + binding->block = NULL; GC_WB(&binding->self, block->self); GC_WB(&binding->locals, block->locals); Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2009-10-15 23:50:21 UTC (rev 2818) +++ MacRuby/trunk/vm.cpp 2009-10-15 23:51:16 UTC (rev 2819) @@ -2562,7 +2562,10 @@ rb_vm_add_binding_lvar_use(binding, current_block, parent_var_uses); - GET_VM()->push_current_binding(binding); + RoxorVM *vm = GET_VM(); + GC_WB(&binding->block, vm->current_block()); + + vm->push_current_binding(binding); } extern "C" @@ -3274,6 +3277,8 @@ RoxorCompiler::shared->set_dynamic_class(true); } + vm->add_current_block(binding != NULL ? binding->block : NULL); + struct Finally { RoxorVM *vm; bool old_dynamic_class; @@ -3289,6 +3294,7 @@ RoxorCompiler::shared->set_dynamic_class(old_dynamic_class); vm->set_current_top_object(old_top_object); vm->set_current_class(old_class); + vm->pop_current_block(); } } finalizer(vm, old_dynamic_class, old_class, old_top_object); Modified: MacRuby/trunk/vm.h =================================================================== --- MacRuby/trunk/vm.h 2009-10-15 23:50:21 UTC (rev 2818) +++ MacRuby/trunk/vm.h 2009-10-15 23:51:16 UTC (rev 2819) @@ -53,6 +53,7 @@ typedef struct { VALUE self; + rb_vm_block_t *block; rb_vm_local_t *locals; } rb_vm_binding_t;

1 0

[2818] MacRuby/trunk/test_vm/eval.rb
by source_changes＠macosforge.org 15 Oct '09

15 Oct '09

Revision: 2818 http://trac.macosforge.org/projects/ruby/changeset/2818 Author: lsansonetti(a)apple.com Date: 2009-10-15 16:50:21 -0700 (Thu, 15 Oct 2009) Log Message: ----------- added 2 tests (contributed by jazzbox at 7zz.de) Modified Paths: -------------- MacRuby/trunk/test_vm/eval.rb Modified: MacRuby/trunk/test_vm/eval.rb =================================================================== --- MacRuby/trunk/test_vm/eval.rb 2009-10-15 22:25:22 UTC (rev 2817) +++ MacRuby/trunk/test_vm/eval.rb 2009-10-15 23:50:21 UTC (rev 2818) @@ -118,4 +118,25 @@ rescue Exception => e end p e.backtrace.kind_of? Array -} \ No newline at end of file +} + +assert 'true', %{ + class Foo + def get_binding + binding + end + end + b = Foo.new.get_binding { 42 } + p eval "block_given?", b +} + +assert '42', %{ + class Foo + def get_binding + binding + end + end + b = Foo.new.get_binding { 42 } + p eval "yield", b +} +

1 0

[2817] MacRuby/trunk/io.c
by source_changes＠macosforge.org 15 Oct '09

15 Oct '09

Revision: 2817 http://trac.macosforge.org/projects/ruby/changeset/2817 Author: lsansonetti(a)apple.com Date: 2009-10-15 15:25:22 -0700 (Thu, 15 Oct 2009) Log Message: ----------- fixed IO#puts with recursive arrays Modified Paths: -------------- MacRuby/trunk/io.c Modified: MacRuby/trunk/io.c =================================================================== --- MacRuby/trunk/io.c 2009-10-15 22:24:54 UTC (rev 2816) +++ MacRuby/trunk/io.c 2009-10-15 22:25:22 UTC (rev 2817) @@ -2615,19 +2615,19 @@ VALUE rb_io_puts(VALUE out, SEL sel, int argc, VALUE *argv); static VALUE -io_puts_ary(VALUE ary, SEL sel, VALUE out, int recur) +io_puts_ary(VALUE ary, VALUE out, int recur) { VALUE tmp; long i, count; if (recur) { tmp = rb_str_new2("[...]"); - rb_io_puts(out, sel, 1, &tmp); + rb_io_puts(out, 0, 1, &tmp); return Qnil; } for (i = 0, count = RARRAY_LEN(ary); i < count; i++) { tmp = RARRAY_AT(ary, i); - rb_io_puts(out, sel, 1, &tmp); + rb_io_puts(out, 0, 1, &tmp); } return Qnil; } @@ -2644,7 +2644,7 @@ for (i = 0; i < argc; i++) { line = rb_check_array_type(argv[i]); if (!NIL_P(line)) { - io_puts_ary(line, sel, out, 0); + rb_exec_recursive(io_puts_ary, line, out); continue; } line = rb_obj_as_string(argv[i]);

1 0

[2816] MacRuby/trunk/spec/frozen/tags/macruby/core/kernel/puts_tags.txt
by source_changes＠macosforge.org 15 Oct '09

15 Oct '09

Revision: 2816 http://trac.macosforge.org/projects/ruby/changeset/2816 Author: lsansonetti(a)apple.com Date: 2009-10-15 15:24:54 -0700 (Thu, 15 Oct 2009) Log Message: ----------- re-tagging a failing spec from critical to fails (it still doesn't pass because mspec is just a big pile of what you know) Modified Paths: -------------- MacRuby/trunk/spec/frozen/tags/macruby/core/kernel/puts_tags.txt Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/kernel/puts_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/kernel/puts_tags.txt 2009-10-15 22:17:40 UTC (rev 2815) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/kernel/puts_tags.txt 2009-10-15 22:24:54 UTC (rev 2816) @@ -1,4 +1,4 @@ -critical:Kernel#puts writes [...] for a recursive array arg +fails:Kernel#puts writes [...] for a recursive array arg fails:Kernel#puts writes just a newline when given no args fails:Kernel#puts writes nil with a newline when given nil as an arg fails:Kernel#puts calls to_s before writing non-string objects

1 0