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

[3729] MacRuby/branches/icu/ext/zlib/zlib.c
by source_changes＠macosforge.org 10 Mar '10

10 Mar '10

Revision: 3729 http://trac.macosforge.org/projects/ruby/changeset/3729 Author: lsansonetti(a)apple.com Date: 2010-03-09 19:09:42 -0800 (Tue, 09 Mar 2010) Log Message: ----------- re-indent some code Modified Paths: -------------- MacRuby/branches/icu/ext/zlib/zlib.c Modified: MacRuby/branches/icu/ext/zlib/zlib.c =================================================================== --- MacRuby/branches/icu/ext/zlib/zlib.c 2010-03-10 03:07:55 UTC (rev 3728) +++ MacRuby/branches/icu/ext/zlib/zlib.c 2010-03-10 03:09:42 UTC (rev 3729) @@ -552,11 +552,11 @@ zstream_discard_input(struct zstream *z, unsigned int len) { if (NIL_P(z->input) || BSTRING_LEN(z->input) <= len) { - z->input = Qnil; + z->input = Qnil; } else { - UInt8 *buf = BSTRING_PTR(z->input); - memmove(buf, buf+len, BSTRING_LEN(z->input) - len); - rb_bstr_resize(z->input, BSTRING_LEN(z->input) - len); + UInt8 *buf = BSTRING_PTR(z->input); + memmove(buf, buf+len, BSTRING_LEN(z->input) - len); + rb_bstr_resize(z->input, BSTRING_LEN(z->input) - len); } }

1 0

[3728] MacRuby/branches/icu/string.c
by source_changes＠macosforge.org 10 Mar '10

10 Mar '10

Revision: 3728 http://trac.macosforge.org/projects/ruby/changeset/3728 Author: lsansonetti(a)apple.com Date: 2010-03-09 19:07:55 -0800 (Tue, 09 Mar 2010) Log Message: ----------- make rb_bstr_resize set the length too Modified Paths: -------------- MacRuby/branches/icu/string.c Modified: MacRuby/branches/icu/string.c =================================================================== --- MacRuby/branches/icu/string.c 2010-03-10 02:28:39 UTC (rev 3727) +++ MacRuby/branches/icu/string.c 2010-03-10 03:07:55 UTC (rev 3728) @@ -5469,6 +5469,7 @@ { assert(IS_BSTR(str)); str_resize_bytes(RSTR(str), capa); + RSTR(str)->length_in_bytes = capa; } void

1 0

[3727] MacRuby/branches/icu/encoding.c
by source_changes＠macosforge.org 10 Mar '10

10 Mar '10

Revision: 3727 http://trac.macosforge.org/projects/ruby/changeset/3727 Author: lsansonetti(a)apple.com Date: 2010-03-09 18:28:39 -0800 (Tue, 09 Mar 2010) Log Message: ----------- added #find Modified Paths: -------------- MacRuby/branches/icu/encoding.c Modified: MacRuby/branches/icu/encoding.c =================================================================== --- MacRuby/branches/icu/encoding.c 2010-03-10 02:21:42 UTC (rev 3726) +++ MacRuby/branches/icu/encoding.c 2010-03-10 02:28:39 UTC (rev 3727) @@ -69,6 +69,18 @@ } static VALUE +mr_enc_s_find(VALUE klass, SEL sel, VALUE name) +{ + StringValue(name); + rb_encoding_t *enc = rb_enc_find(RSTRING_PTR(name)); + if (enc == NULL) { + rb_raise(rb_eArgError, "unknown encoding name - %s", + RSTRING_PTR(name)); + } + return (VALUE)enc; +} + +static VALUE mr_enc_s_default_internal(VALUE klass, SEL sel) { return (VALUE)default_internal; @@ -260,22 +272,22 @@ rb_objc_define_method(rb_cEncoding, "dummy?", mr_enc_dummy_p, 0); rb_objc_define_method(rb_cEncoding, "ascii_compatible?", mr_enc_ascii_compatible_p, 0); - rb_objc_define_method(CLASS_OF(rb_cEncoding), "list", mr_enc_s_list, 0); - rb_objc_define_method(CLASS_OF(rb_cEncoding), "name_list", + rb_objc_define_method(*(VALUE *)rb_cEncoding, "list", mr_enc_s_list, 0); + rb_objc_define_method(*(VALUE *)rb_cEncoding, "name_list", mr_enc_s_name_list, 0); - rb_objc_define_method(CLASS_OF(rb_cEncoding), "aliases", + rb_objc_define_method(*(VALUE *)rb_cEncoding, "aliases", mr_enc_s_aliases, 0); - //rb_define_singleton_method(rb_cEncoding, "find", enc_find, 1); - rb_objc_define_method(CLASS_OF(rb_cEncoding), "compatible?", + rb_objc_define_method(*(VALUE *)rb_cEncoding, "find", mr_enc_s_find, 1); + rb_objc_define_method(*(VALUE *)rb_cEncoding, "compatible?", mr_enc_s_is_compatible, 2); // in string.c //rb_define_method(rb_cEncoding, "_dump", enc_dump, -1); //rb_define_singleton_method(rb_cEncoding, "_load", enc_load, 1); - rb_objc_define_method(CLASS_OF(rb_cEncoding), "default_external", + 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(CLASS_OF(rb_cEncoding), "default_internal", + 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_define_singleton_method(rb_cEncoding, "locale_charmap", rb_locale_charmap, 0);

1 0

[3726] MacRuby/branches/icu/ext/digest/digest.c
by source_changes＠macosforge.org 10 Mar '10

10 Mar '10

Revision: 3726 http://trac.macosforge.org/projects/ruby/changeset/3726 Author: lsansonetti(a)apple.com Date: 2010-03-09 18:21:42 -0800 (Tue, 09 Mar 2010) Log Message: ----------- fixed a bug in #digest Modified Paths: -------------- MacRuby/branches/icu/ext/digest/digest.c Modified: MacRuby/branches/icu/ext/digest/digest.c =================================================================== --- MacRuby/branches/icu/ext/digest/digest.c 2010-03-10 02:13:37 UTC (rev 3725) +++ MacRuby/branches/icu/ext/digest/digest.c 2010-03-10 02:21:42 UTC (rev 3726) @@ -543,6 +543,7 @@ str = rb_bstr_new(); rb_bstr_resize(str, algo->digest_len); + rb_bstr_set_length(str, algo->digest_len); algo->finish_func(pctx, rb_bstr_bytes(str)); /* avoid potential coredump caused by use of a finished context */

1 0

[3725] MacRuby/branches/icu/ext/digest/digest.c
by source_changes＠macosforge.org 10 Mar '10

10 Mar '10

Revision: 3725 http://trac.macosforge.org/projects/ruby/changeset/3725 Author: lsansonetti(a)apple.com Date: 2010-03-09 18:13:37 -0800 (Tue, 09 Mar 2010) Log Message: ----------- misc bug fix Modified Paths: -------------- MacRuby/branches/icu/ext/digest/digest.c Modified: MacRuby/branches/icu/ext/digest/digest.c =================================================================== --- MacRuby/branches/icu/ext/digest/digest.c 2010-03-10 01:54:46 UTC (rev 3724) +++ MacRuby/branches/icu/ext/digest/digest.c 2010-03-10 02:13:37 UTC (rev 3725) @@ -541,8 +541,9 @@ Data_Get_Struct(self, void, pctx); - str = rb_str_new(0, algo->digest_len); - algo->finish_func(pctx, (unsigned char *)RSTRING_PTR(str)); + str = rb_bstr_new(); + rb_bstr_resize(str, algo->digest_len); + algo->finish_func(pctx, rb_bstr_bytes(str)); /* avoid potential coredump caused by use of a finished context */ algo->init_func(pctx);

1 0

[3724] MacRuby/branches/icu/lib/rubygems/remote_fetcher.rb
by source_changes＠macosforge.org 10 Mar '10

10 Mar '10

Revision: 3724 http://trac.macosforge.org/projects/ruby/changeset/3724 Author: lsansonetti(a)apple.com Date: 2010-03-09 17:54:46 -0800 (Tue, 09 Mar 2010) Log Message: ----------- String.__new_bytestring__ -> String.new Modified Paths: -------------- MacRuby/branches/icu/lib/rubygems/remote_fetcher.rb Modified: MacRuby/branches/icu/lib/rubygems/remote_fetcher.rb =================================================================== --- MacRuby/branches/icu/lib/rubygems/remote_fetcher.rb 2010-03-10 01:54:21 UTC (rev 3723) +++ MacRuby/branches/icu/lib/rubygems/remote_fetcher.rb 2010-03-10 01:54:46 UTC (rev 3724) @@ -263,9 +263,7 @@ if data.nil? raise Gem::RemoteFetcher::FetchError, "error when fetching data from #{uri}" end - string = String.__new_bytestring__(data) - #block.call(string) if block - return string + return String.new(data) end raise "block is dead" if block_given?

1 0

[3723] MacRuby/branches/icu/string.c
by source_changes＠macosforge.org 10 Mar '10

10 Mar '10

Revision: 3723 http://trac.macosforge.org/projects/ruby/changeset/3723 Author: lsansonetti(a)apple.com Date: 2010-03-09 17:54:21 -0800 (Tue, 09 Mar 2010) Log Message: ----------- added NSData#to_str as a convenience method Modified Paths: -------------- MacRuby/branches/icu/string.c Modified: MacRuby/branches/icu/string.c =================================================================== --- MacRuby/branches/icu/string.c 2010-03-10 01:53:55 UTC (rev 3722) +++ MacRuby/branches/icu/string.c 2010-03-10 01:54:21 UTC (rev 3723) @@ -5226,6 +5226,15 @@ str_splice(RSTR(rcv), range.location, range.length, spat, true); } +// :nodoc: +static VALUE +nsdata_to_str(VALUE data, SEL sel) +{ + CFDataRef dataref = (CFDataRef)data; + return rb_bstr_new_with_data(CFDataGetBytePtr(dataref), + CFDataGetLength(dataref)); +} + void Init_String(void) { @@ -5373,6 +5382,11 @@ rb_fs = Qnil; rb_define_variable("$;", &rb_fs); rb_define_variable("$-F", &rb_fs); + + // NSData extensions. + VALUE NSData = (VALUE)objc_getClass("NSData"); + assert(NSData != 0); + rb_objc_define_method(NSData, "to_str", nsdata_to_str, 0); } bool

1 0

[3722] MacRuby/branches/icu/lib/stringio.rb
by source_changes＠macosforge.org 10 Mar '10

10 Mar '10

Revision: 3722 http://trac.macosforge.org/projects/ruby/changeset/3722 Author: lsansonetti(a)apple.com Date: 2010-03-09 17:53:55 -0800 (Tue, 09 Mar 2010) Log Message: ----------- ByteString no longer exist Modified Paths: -------------- MacRuby/branches/icu/lib/stringio.rb Modified: MacRuby/branches/icu/lib/stringio.rb =================================================================== --- MacRuby/branches/icu/lib/stringio.rb 2010-03-10 01:46:19 UTC (rev 3721) +++ MacRuby/branches/icu/lib/stringio.rb 2010-03-10 01:53:55 UTC (rev 3722) @@ -52,7 +52,7 @@ # # Creates new StringIO instance from with _string_ and _mode_. # - def initialize(string = ByteString.new, mode = nil) + def initialize(string = String.new, mode = nil) @string = string.to_str @pos = 0 @lineno = 0 @@ -127,7 +127,7 @@ # # See IO#read. # - def read(length = nil, buffer = ByteString.new) + def read(length = nil, buffer = String.new) raise IOError, "not opened for reading" unless @readable raise TypeError unless buffer.respond_to?(:to_str) buffer = buffer.to_str @@ -152,7 +152,7 @@ # # Similar to #read, but raises +EOFError+ at end of string instead of # returning +nil+, as well as IO#sysread does. - def sysread(length = nil, buffer = ByteString.new) + def sysread(length = nil, buffer = String.new) val = read(length, buffer) ( buffer.clear && raise(IO::EOFError, "end of file reached")) if val == nil val

1 0

[3721] MacRuby/branches/icu/re.cpp
by source_changes＠macosforge.org 10 Mar '10

10 Mar '10

Revision: 3721 http://trac.macosforge.org/projects/ruby/changeset/3721 Author: lsansonetti(a)apple.com Date: 2010-03-09 17:46:19 -0800 (Tue, 09 Mar 2010) Log Message: ----------- fixed a bug in Match#[] Modified Paths: -------------- MacRuby/branches/icu/re.cpp Modified: MacRuby/branches/icu/re.cpp =================================================================== --- MacRuby/branches/icu/re.cpp 2010-03-10 01:29:16 UTC (rev 3720) +++ MacRuby/branches/icu/re.cpp 2010-03-10 01:46:19 UTC (rev 3721) @@ -1371,10 +1371,14 @@ rb_scan_args(argc, argv, "11", &backref, &rest); if (NIL_P(rest)) { - const int pos = match_backref_number(rcv, backref, false); - return rb_reg_nth_match(pos, rcv); + switch (TYPE(backref)) { + case T_STRING: + case T_SYMBOL: + case T_FIXNUM: + const int pos = match_backref_number(rcv, backref, false); + return rb_reg_nth_match(pos, rcv); + } } - return rb_ary_aref(match_to_a(rcv, 0), 0, argc, argv); }

1 0

[3720] MacRuby/branches/icu/lib/net/telnet.rb
by source_changes＠macosforge.org 10 Mar '10

10 Mar '10

Revision: 3720 http://trac.macosforge.org/projects/ruby/changeset/3720 Author: lsansonetti(a)apple.com Date: 2010-03-09 17:29:16 -0800 (Tue, 09 Mar 2010) Log Message: ----------- comment a regexp that won't compile with ICU Modified Paths: -------------- MacRuby/branches/icu/lib/net/telnet.rb Modified: MacRuby/branches/icu/lib/net/telnet.rb =================================================================== --- MacRuby/branches/icu/lib/net/telnet.rb 2010-03-10 01:28:51 UTC (rev 3719) +++ MacRuby/branches/icu/lib/net/telnet.rb 2010-03-10 01:29:16 UTC (rev 3720) @@ -320,7 +320,8 @@ hexvals = line.unpack('H*')[0] hexvals += ' ' * (32 - hexvals.length) hexvals = format("%s %s %s %s " * 4, *hexvals.unpack('a2' * 16)) - line = line.gsub(/[\000-\037\177-\377]/n, '.') + # XXX MacRuby will not parse this regexp. + #line = line.gsub(/[\000-\037\177-\377]/n, '.') printf "%s 0x%5.5x: %s%s\n", dir, addr, hexvals, line addr += 16 offset += 16

1 0