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

[3789] MacRuby/trunk/string.c
by source_changes＠macosforge.org 18 Mar '10

18 Mar '10

Revision: 3789 http://trac.macosforge.org/projects/ruby/changeset/3789 Author: lsansonetti(a)apple.com Date: 2010-03-17 18:07:57 -0700 (Wed, 17 Mar 2010) Log Message: ----------- fixed a minor problem in rb_reg_regsub() Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2010-03-18 01:05:03 UTC (rev 3788) +++ MacRuby/trunk/string.c 2010-03-18 01:07:57 UTC (rev 3789) @@ -3232,8 +3232,10 @@ } break; + default: + str_append_uchar(RSTR(val), '\\'); + // fall through case '\\': - default: str_append_uchar(RSTR(val), c); break; }

1 0

[3788] MacRuby/trunk/ext/bigdecimal/bigdecimal.c
by source_changes＠macosforge.org 18 Mar '10

18 Mar '10

Revision: 3788 http://trac.macosforge.org/projects/ruby/changeset/3788 Author: martinlagardette(a)apple.com Date: 2010-03-17 18:05:03 -0700 (Wed, 17 Mar 2010) Log Message: ----------- Avoid integer truncation in BigDecimal In a 64-bit program, if mb is > 2^32, the amount to allocate will be truncated to a 32-bit unsigned integer, but then the amount to memset will use the full 64-bit number." - Fixes 7697476 Modified Paths: -------------- MacRuby/trunk/ext/bigdecimal/bigdecimal.c Modified: MacRuby/trunk/ext/bigdecimal/bigdecimal.c =================================================================== --- MacRuby/trunk/ext/bigdecimal/bigdecimal.c 2010-03-17 21:35:16 UTC (rev 3787) +++ MacRuby/trunk/ext/bigdecimal/bigdecimal.c 2010-03-18 01:05:03 UTC (rev 3788) @@ -2020,7 +2020,7 @@ VP_EXPORT void * VpMemAlloc(U_LONG mb) { - void *p = xmalloc((unsigned int)mb); + void *p = xmalloc(mb); if(!p) { VpException(VP_EXCEPTION_MEMORY,"failed to allocate memory",1); }

1 0

[3787] MacRuby/trunk/string.c
by source_changes＠macosforge.org 17 Mar '10

17 Mar '10

Revision: 3787 http://trac.macosforge.org/projects/ruby/changeset/3787 Author: lsansonetti(a)apple.com Date: 2010-03-17 14:35:16 -0700 (Wed, 17 Mar 2010) Log Message: ----------- fixed a couple of bugs in #gsub Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2010-03-17 18:35:16 UTC (rev 3786) +++ MacRuby/trunk/string.c 2010-03-17 21:35:16 UTC (rev 3787) @@ -3415,6 +3415,7 @@ long offset = 0, last = 0; bool changed = false; const long len = str_length(RSTR(str), false); + VALUE match = Qnil; while (true) { const long pos = rb_reg_search(pat, str, offset, false); @@ -3429,7 +3430,7 @@ break; } - VALUE match = rb_backref_get(); + match = rb_backref_get(); int count = 0; rb_match_result_t *results = rb_reg_match_results(match, &count); assert(count > 0); @@ -3455,9 +3456,9 @@ val = rb_reg_regsub(repl, str, pat, results, count); } - if (pos - offset > 0) { + if (pos - last > 0) { str_concat_string(RSTR(dest), - RSTR(rstr_substr(str, offset, pos - offset))); + RSTR(rstr_substr(str, last, pos - last))); } str_concat_string(RSTR(dest), str_need_string(val)); @@ -3470,10 +3471,10 @@ if (results[0].beg == offset) { offset++; } - - rb_backref_set(match); } + rb_backref_set(match); + if (bang) { rstr_modify(str); str_replace(RSTR(str), dest);

1 0

[3786] MacRuby/trunk/lib/mkmf.rb
by source_changes＠macosforge.org 17 Mar '10

17 Mar '10

Revision: 3786 http://trac.macosforge.org/projects/ruby/changeset/3786 Author: martinlagardette(a)apple.com Date: 2010-03-17 11:35:16 -0700 (Wed, 17 Mar 2010) Log Message: ----------- Fixed typo in lib/mkmf.rb - Fixes 7683120 Modified Paths: -------------- MacRuby/trunk/lib/mkmf.rb Modified: MacRuby/trunk/lib/mkmf.rb =================================================================== --- MacRuby/trunk/lib/mkmf.rb 2010-03-17 18:22:13 UTC (rev 3785) +++ MacRuby/trunk/lib/mkmf.rb 2010-03-17 18:35:16 UTC (rev 3786) @@ -357,7 +357,7 @@ def try_do(src, command, &b) unless have_devel? raise <<MSG -The complier failed to generate an executable file. +The compiler failed to generate an executable file. You have to install development tools first. MSG end

1 0

[3785] MacRuby/trunk/dispatcher.cpp
by source_changes＠macosforge.org 17 Mar '10

17 Mar '10

Revision: 3785 http://trac.macosforge.org/projects/ruby/changeset/3785 Author: martinlagardette(a)apple.com Date: 2010-03-17 11:22:13 -0700 (Wed, 17 Mar 2010) Log Message: ----------- Raise if no block given in rb_vm_yield_under - Fixes 7682741 & 7692160 Modified Paths: -------------- MacRuby/trunk/dispatcher.cpp Modified: MacRuby/trunk/dispatcher.cpp =================================================================== --- MacRuby/trunk/dispatcher.cpp 2010-03-17 08:59:02 UTC (rev 3784) +++ MacRuby/trunk/dispatcher.cpp 2010-03-17 18:22:13 UTC (rev 3785) @@ -1645,6 +1645,10 @@ { RoxorVM *vm = GET_VM(); rb_vm_block_t *b = vm->current_block(); + if (b == NULL) { + rb_raise(rb_eLocalJumpError, "no block given"); + } + vm->pop_current_block(); VALUE old_self = b->self;

1 0

[3784] MacRuby/trunk/string.c
by source_changes＠macosforge.org 17 Mar '10

17 Mar '10

Revision: 3784 http://trac.macosforge.org/projects/ruby/changeset/3784 Author: lsansonetti(a)apple.com Date: 2010-03-17 01:59:02 -0700 (Wed, 17 Mar 2010) Log Message: ----------- str_concat_string() should not replace the receiver's encoding Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2010-03-17 01:59:40 UTC (rev 3783) +++ MacRuby/trunk/string.c 2010-03-17 08:59:02 UTC (rev 3784) @@ -831,10 +831,6 @@ if (str->length_in_bytes == 0) { return; } - if (self->length_in_bytes == 0) { - str_replace_with_string(self, str); - return; - } str_must_have_compatible_encoding(self, str); str_make_same_format(self, str); @@ -5520,7 +5516,7 @@ VALUE rb_str_new_fast(int argc, ...) { - VALUE str = (VALUE)str_alloc(rb_cRubyString); + VALUE str = rb_str_new(NULL, 0); if (argc > 0) { va_list ar;

1 0

[3783] MacRuby/trunk/class.c
by source_changes＠macosforge.org 17 Mar '10

17 Mar '10

Revision: 3783 http://trac.macosforge.org/projects/ruby/changeset/3783 Author: martinlagardette(a)apple.com Date: 2010-03-16 18:59:40 -0700 (Tue, 16 Mar 2010) Log Message: ----------- Avoid a crash in #define_singleton_method on Floats - Fixes 7693326 Modified Paths: -------------- MacRuby/trunk/class.c Modified: MacRuby/trunk/class.c =================================================================== --- MacRuby/trunk/class.c 2010-03-17 01:43:05 UTC (rev 3782) +++ MacRuby/trunk/class.c 2010-03-17 01:59:40 UTC (rev 3783) @@ -1136,7 +1136,7 @@ { VALUE klass; - if (FIXNUM_P(obj) || SYMBOL_P(obj)) { + if (FIXNUM_P(obj) || SYMBOL_P(obj) || FIXFLOAT_P(obj)) { rb_raise(rb_eTypeError, "can't define singleton"); } if (rb_special_const_p(obj)) {

1 0

[3782] MacRuby/trunk
by source_changes＠macosforge.org 17 Mar '10

17 Mar '10

Revision: 3782 http://trac.macosforge.org/projects/ruby/changeset/3782 Author: lsansonetti(a)apple.com Date: 2010-03-16 18:43:05 -0700 (Tue, 16 Mar 2010) Log Message: ----------- IO and Marshal now returning UTF8 strings Modified Paths: -------------- MacRuby/trunk/encoding.h MacRuby/trunk/io.c MacRuby/trunk/marshal.c MacRuby/trunk/string.c Modified: MacRuby/trunk/encoding.h =================================================================== --- MacRuby/trunk/encoding.h 2010-03-17 00:32:04 UTC (rev 3781) +++ MacRuby/trunk/encoding.h 2010-03-17 01:43:05 UTC (rev 3782) @@ -306,6 +306,7 @@ unsigned long rb_str_hash_uchars(const UChar *chars, long chars_len); long rb_uchar_strtol(UniChar *chars, long chars_len, long pos, long *end_offset); +void rb_str_force_encoding(VALUE str, rb_encoding_t *encoding); #if defined(__cplusplus) } // extern "C" Modified: MacRuby/trunk/io.c =================================================================== --- MacRuby/trunk/io.c 2010-03-17 00:32:04 UTC (rev 3781) +++ MacRuby/trunk/io.c 2010-03-17 01:43:05 UTC (rev 3782) @@ -1118,12 +1118,15 @@ rb_io_t *io_struct = ExtractIOStruct(io); rb_io_assert_readable(io_struct); + bool outbuf_created = false; if (NIL_P(outbuf)) { outbuf = rb_bstr_new(); + outbuf_created = true; } if (NIL_P(len)) { - return rb_io_read_all(io_struct, outbuf); + rb_io_read_all(io_struct, outbuf); + goto bail; } const long size = FIX2LONG(len); @@ -1148,6 +1151,10 @@ } rb_bstr_set_length(outbuf, data_read); +bail: + if (outbuf_created) { + rb_str_force_encoding(outbuf, rb_encodings[ENCODING_UTF8]); + } return outbuf; } @@ -1365,6 +1372,7 @@ OBJ_TAINT(bstr); io_struct->lineno += 1; ARGF.lineno = INT2FIX(io_struct->lineno); + rb_str_force_encoding(bstr, rb_encodings[ENCODING_UTF8]); return bstr; } @@ -3346,7 +3354,7 @@ VALUE outbuf = rb_bstr_new(); rb_io_read_all(ExtractIOStruct(io), outbuf); rb_io_close(io); - + rb_str_force_encoding(outbuf, rb_encodings[ENCODING_UTF8]); return outbuf; } @@ -3852,7 +3860,7 @@ void *ptr; while ((ptr = memchr(&bytes[pos], byte, length - pos)) != NULL) { const long s = (long)ptr - (long)&bytes[pos] + 1; - rb_ary_push(ary, rb_bstr_new_with_data(&bytes[pos], s)); + rb_ary_push(ary, rb_str_new((char *)&bytes[pos], s)); pos += s; } } Modified: MacRuby/trunk/marshal.c =================================================================== --- MacRuby/trunk/marshal.c 2010-03-17 00:32:04 UTC (rev 3781) +++ MacRuby/trunk/marshal.c 2010-03-17 01:43:05 UTC (rev 3782) @@ -1023,7 +1023,9 @@ if (got_io) { rb_io_write(port, 0, arg->str); } - + else { + rb_str_force_encoding(port, rb_encodings[ENCODING_UTF8]); + } return port; } Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2010-03-17 00:32:04 UTC (rev 3781) +++ MacRuby/trunk/string.c 2010-03-17 01:43:05 UTC (rev 3782) @@ -1533,22 +1533,28 @@ * Changes the encoding to +encoding+ and returns self. */ +void +rb_str_force_encoding(VALUE str, rb_encoding_t *enc) +{ + assert(IS_RSTR(str)); + if (enc != RSTR(str)->encoding) { + str_make_data_binary(RSTR(str)); + if (NATIVE_UTF16_ENC(RSTR(str)->encoding)) { + str_set_stored_in_uchars(RSTR(str), false); + } + RSTR(str)->encoding = enc; + str_unset_facultative_flags(RSTR(str)); + if (NATIVE_UTF16_ENC(RSTR(str)->encoding)) { + str_set_stored_in_uchars(RSTR(str), true); + } + } +} + static VALUE rstr_force_encoding(VALUE self, SEL sel, VALUE encoding) { rstr_modify(self); - rb_encoding_t *enc = rb_to_encoding(encoding); - if (enc != RSTR(self)->encoding) { - str_make_data_binary(RSTR(self)); - if (NATIVE_UTF16_ENC(RSTR(self)->encoding)) { - str_set_stored_in_uchars(RSTR(self), false); - } - RSTR(self)->encoding = enc; - str_unset_facultative_flags(RSTR(self)); - if (NATIVE_UTF16_ENC(RSTR(self)->encoding)) { - str_set_stored_in_uchars(RSTR(self), true); - } - } + rb_str_force_encoding(self, rb_to_encoding(encoding)); return self; }

1 0

[3781] MacRuby/trunk/spec/frozen/library/digest
by source_changes＠macosforge.org 17 Mar '10

17 Mar '10

Revision: 3781 http://trac.macosforge.org/projects/ruby/changeset/3781 Author: lsansonetti(a)apple.com Date: 2010-03-16 17:32:04 -0700 (Tue, 16 Mar 2010) Log Message: ----------- fix digest length specs for 1.9, since the constant strings are UTF-8 encoded, their length is not the same Modified Paths: -------------- MacRuby/trunk/spec/frozen/library/digest/md5/shared/length.rb MacRuby/trunk/spec/frozen/library/digest/sha256/shared/length.rb MacRuby/trunk/spec/frozen/library/digest/sha384/shared/length.rb MacRuby/trunk/spec/frozen/library/digest/sha512/shared/length.rb Modified: MacRuby/trunk/spec/frozen/library/digest/md5/shared/length.rb =================================================================== --- MacRuby/trunk/spec/frozen/library/digest/md5/shared/length.rb 2010-03-17 00:30:34 UTC (rev 3780) +++ MacRuby/trunk/spec/frozen/library/digest/md5/shared/length.rb 2010-03-17 00:32:04 UTC (rev 3781) @@ -1,8 +1,19 @@ describe :md5_length, :shared => true do - it 'returns the length of the digest' do - cur_digest = Digest::MD5.new - cur_digest.send((a)method).should == MD5Constants::BlankDigest.size - cur_digest << MD5Constants::Contents - cur_digest.send((a)method).should == MD5Constants::Digest.size + ruby_version_is "" ... "1.9" do + it 'returns the length of the digest' do + cur_digest = Digest::MD5.new + cur_digest.send((a)method).should == MD5Constants::BlankDigest.size + cur_digest << MD5Constants::Contents + cur_digest.send((a)method).should == MD5Constants::Digest.size + end end + + ruby_version_is "1.9" do + it 'returns the length of the digest' do + cur_digest = Digest::MD5.new + cur_digest.send((a)method).should == MD5Constants::BlankDigest.dup.force_encoding('ascii-8bit').size + cur_digest << MD5Constants::Contents + cur_digest.send((a)method).should == MD5Constants::Digest.dup.force_encoding('ascii-8bit').size + end + end end Modified: MacRuby/trunk/spec/frozen/library/digest/sha256/shared/length.rb =================================================================== --- MacRuby/trunk/spec/frozen/library/digest/sha256/shared/length.rb 2010-03-17 00:30:34 UTC (rev 3780) +++ MacRuby/trunk/spec/frozen/library/digest/sha256/shared/length.rb 2010-03-17 00:32:04 UTC (rev 3781) @@ -1,8 +1,18 @@ describe :sha256_length, :shared => true do - it 'returns the length of the digest' do - cur_digest = Digest::SHA256.new - cur_digest.send((a)method).should == SHA256Constants::BlankDigest.size - cur_digest << SHA256Constants::Contents - cur_digest.send((a)method).should == SHA256Constants::Digest.size + ruby_version_is "" ... "1.9" do + it 'returns the length of the digest' do + cur_digest = Digest::SHA256.new + cur_digest.send((a)method).should == SHA256Constants::BlankDigest.size + cur_digest << SHA256Constants::Contents + cur_digest.send((a)method).should == SHA256Constants::Digest.size + end end + ruby_version_is "1.9" do + it 'returns the length of the digest' do + cur_digest = Digest::SHA256.new + cur_digest.send((a)method).should == SHA256Constants::BlankDigest.dup.force_encoding('ascii-8bit').size + cur_digest << SHA256Constants::Contents + cur_digest.send((a)method).should == SHA256Constants::Digest.dup.force_encoding('ascii-8bit').size + end + end end Modified: MacRuby/trunk/spec/frozen/library/digest/sha384/shared/length.rb =================================================================== --- MacRuby/trunk/spec/frozen/library/digest/sha384/shared/length.rb 2010-03-17 00:30:34 UTC (rev 3780) +++ MacRuby/trunk/spec/frozen/library/digest/sha384/shared/length.rb 2010-03-17 00:32:04 UTC (rev 3781) @@ -1,8 +1,18 @@ describe :sha384_length, :shared => true do - it 'returns the length of the digest' do - cur_digest = Digest::SHA384.new - cur_digest.send((a)method).should == SHA384Constants::BlankDigest.size - cur_digest << SHA384Constants::Contents - cur_digest.send((a)method).should == SHA384Constants::Digest.size + ruby_version_is "" ... "1.9" do + it 'returns the length of the digest' do + cur_digest = Digest::SHA384.new + cur_digest.send((a)method).should == SHA384Constants::BlankDigest.size + cur_digest << SHA384Constants::Contents + cur_digest.send((a)method).should == SHA384Constants::Digest.size + end end + ruby_version_is "1.9" do + it 'returns the length of the digest' do + cur_digest = Digest::SHA384.new + cur_digest.send((a)method).should == SHA384Constants::BlankDigest.dup.force_encoding('ascii-8bit').size + cur_digest << SHA384Constants::Contents + cur_digest.send((a)method).should == SHA384Constants::Digest.dup.force_encoding('ascii-8bit').size + end + end end Modified: MacRuby/trunk/spec/frozen/library/digest/sha512/shared/length.rb =================================================================== --- MacRuby/trunk/spec/frozen/library/digest/sha512/shared/length.rb 2010-03-17 00:30:34 UTC (rev 3780) +++ MacRuby/trunk/spec/frozen/library/digest/sha512/shared/length.rb 2010-03-17 00:32:04 UTC (rev 3781) @@ -1,8 +1,18 @@ describe :sha512_length, :shared => true do - it 'returns the length of the digest' do - cur_digest = Digest::SHA512.new - cur_digest.send((a)method).should == SHA512Constants::BlankDigest.size - cur_digest << SHA512Constants::Contents - cur_digest.send((a)method).should == SHA512Constants::Digest.size + ruby_version_is "" ... "1.9" do + it 'returns the length of the digest' do + cur_digest = Digest::SHA512.new + cur_digest.send((a)method).should == SHA512Constants::BlankDigest.size + cur_digest << SHA512Constants::Contents + cur_digest.send((a)method).should == SHA512Constants::Digest.size + end end + ruby_version_is "1.9" do + it 'returns the length of the digest' do + cur_digest = Digest::SHA512.new + cur_digest.send((a)method).should == SHA512Constants::BlankDigest.dup.force_encoding('ascii-8bit').size + cur_digest << SHA512Constants::Contents + cur_digest.send((a)method).should == SHA512Constants::Digest.dup.force_encoding('ascii-8bit').size + end + end end

1 0

[3780] MacRuby/trunk/ext/digest
by source_changes＠macosforge.org 17 Mar '10

17 Mar '10

Revision: 3780 http://trac.macosforge.org/projects/ruby/changeset/3780 Author: lsansonetti(a)apple.com Date: 2010-03-16 17:30:34 -0700 (Tue, 16 Mar 2010) Log Message: ----------- no longer returning binary strings, to mimic 1.9 Modified Paths: -------------- MacRuby/trunk/ext/digest/bubblebabble/bubblebabble.c MacRuby/trunk/ext/digest/digest.c Modified: MacRuby/trunk/ext/digest/bubblebabble/bubblebabble.c =================================================================== --- MacRuby/trunk/ext/digest/bubblebabble/bubblebabble.c 2010-03-17 00:26:47 UTC (rev 3779) +++ MacRuby/trunk/ext/digest/bubblebabble/bubblebabble.c 2010-03-17 00:30:34 UTC (rev 3780) @@ -74,7 +74,7 @@ p[j] = 'x'; - VALUE bstr = rb_bstr_new_with_data(p, p_len); + VALUE bstr = rb_str_new(p, p_len); free(p); return bstr; } Modified: MacRuby/trunk/ext/digest/digest.c =================================================================== --- MacRuby/trunk/ext/digest/digest.c 2010-03-17 00:26:47 UTC (rev 3779) +++ MacRuby/trunk/ext/digest/digest.c 2010-03-17 00:30:34 UTC (rev 3780) @@ -37,7 +37,7 @@ const char *digest; size_t digest_len; int i; - UInt8 *p; + char *p; static const char hex[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' @@ -52,7 +52,7 @@ } const size_t p_len = digest_len * 2; - p = (UInt8 *)malloc(p_len + 1); + p = malloc(p_len + 1); for (i = 0; i < digest_len; i++) { unsigned char byte = digest[i]; @@ -61,7 +61,7 @@ p[i + i + 1] = hex[byte & 0x0f]; } - VALUE bstr = rb_bstr_new_with_data(p, p_len); + VALUE bstr = rb_str_new(p, p_len); free(p); return bstr; } @@ -535,20 +535,20 @@ { rb_digest_metadata_t *algo; void *pctx; - VALUE str; algo = get_digest_base_metadata(rb_obj_class(self)); Data_Get_Struct(self, void, pctx); - 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)); + assert(algo->digest_len > 0); + char *buf = (char *)malloc(algo->digest_len); + algo->finish_func(pctx, (unsigned char *)buf); /* avoid potential coredump caused by use of a finished context */ algo->init_func(pctx); + VALUE str = rb_str_new(buf, algo->digest_len); + free(buf); return str; }

1 0