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

[5259] MacRuby/trunk
by source_changes＠macosforge.org 07 Mar '11

07 Mar '11

Revision: 5259 http://trac.macosforge.org/projects/ruby/changeset/5259 Author: watson1978(a)gmail.com Date: 2011-03-06 23:30:41 -0800 (Sun, 06 Mar 2011) Log Message: ----------- Implements the Hash#select!. Test Script: {{{ require 'test/unit/assertions.rb' include Test::Unit::Assertions hash = { "Alice" => 50, "Bob" => 60, "Carol" => 90, "David" => 40 } hash.select! {|k, v| v >= 60 } assert_equal({"Bob"=>60, "Carol"=>90}, hash) puts :ok }}} Modified Paths: -------------- MacRuby/trunk/hash.c MacRuby/trunk/spec/frozen/tags/macruby/core/hash/select_tags.txt Modified: MacRuby/trunk/hash.c =================================================================== --- MacRuby/trunk/hash.c 2011-03-07 06:11:34 UTC (rev 5258) +++ MacRuby/trunk/hash.c 2011-03-07 07:30:41 UTC (rev 5259) @@ -870,18 +870,6 @@ return result; } -/* - * call-seq: - * hsh.keep_if {| key, value | block } -> hsh - * hsh.keep_if -> an_enumerator - * - * Deletes every key-value pair from hsh for which block - * evaluates to false. - * - * If no block is given, an enumerator is returned instead. - * - */ - static int keep_if_i(VALUE key, VALUE value, VALUE hash) { @@ -895,6 +883,43 @@ return ST_CONTINUE; } +/* + * call-seq: + * hsh.select! {| key, value | block } -> hsh or nil + * hsh.select! -> an_enumerator + * + * Equivalent to <code>Hash#keep_if</code>, but returns + * <code>nil</code> if no changes were made. + */ + +static VALUE +rhash_select_bang(VALUE hash, SEL sel) +{ + RETURN_ENUMERATOR(hash, 0, 0); + rhash_modify(hash); + if (!RHASH(hash)->tbl) { + return Qnil; + } + const long n = rhash_len(hash); + rb_hash_foreach(hash, keep_if_i, hash); + if (n == rhash_len(hash)) { + return Qnil; + } + return hash; +} + +/* + * call-seq: + * hsh.keep_if {| key, value | block } -> hsh + * hsh.keep_if -> an_enumerator + * + * Deletes every key-value pair from hsh for which block + * evaluates to false. + * + * If no block is given, an enumerator is returned instead. + * + */ + VALUE rhash_keep_if(VALUE hash, SEL sel) { @@ -1866,6 +1891,7 @@ rb_objc_define_method(rb_cRubyHash, "delete_if", rhash_delete_if, 0); rb_objc_define_method(rb_cRubyHash, "keep_if", rhash_keep_if, 0); rb_objc_define_method(rb_cRubyHash, "select", rhash_select, 0); + rb_objc_define_method(rb_cRubyHash, "select!", rhash_select_bang, 0); rb_objc_define_method(rb_cRubyHash, "reject", rhash_reject, 0); rb_objc_define_method(rb_cRubyHash, "reject!", rhash_reject_bang, 0); rb_objc_define_method(rb_cRubyHash, "clear", rhash_clear, 0); Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/hash/select_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/hash/select_tags.txt 2011-03-07 06:11:34 UTC (rev 5258) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/hash/select_tags.txt 2011-03-07 07:30:41 UTC (rev 5259) @@ -1,4 +0,0 @@ -fails:Hash#select! is equivalent to keep_if if changes are made -fails:Hash#select! returns nil if no changes were made -fails:Hash#select! raises a RuntimeError if called on a frozen instance that is modified -fails:Hash#select! raises a RuntimeError if called on a frozen instance that would not be modified

1 0

[5258] MacRuby/trunk
by source_changes＠macosforge.org 07 Mar '11

07 Mar '11

Revision: 5258 http://trac.macosforge.org/projects/ruby/changeset/5258 Author: watson1978(a)gmail.com Date: 2011-03-06 22:11:34 -0800 (Sun, 06 Mar 2011) Log Message: ----------- Implements the Hash#keep_if. Test Script: {{{ require 'test/unit/assertions.rb' include Test::Unit::Assertions hash = { "Alice" => 50, "Bob" => 60, "Carol" => 90, "David" => 40 } assert_equal({"Alice"=>50, "Bob"=>60, "Carol"=>90}, hash.keep_if {|key, val| val >= 50 } ) puts :ok }}} Modified Paths: -------------- MacRuby/trunk/hash.c MacRuby/trunk/spec/frozen/tags/macruby/core/hash/keep_if_tags.txt Modified: MacRuby/trunk/hash.c =================================================================== --- MacRuby/trunk/hash.c 2011-03-06 11:55:02 UTC (rev 5257) +++ MacRuby/trunk/hash.c 2011-03-07 06:11:34 UTC (rev 5258) @@ -872,6 +872,40 @@ /* * call-seq: + * hsh.keep_if {| key, value | block } -> hsh + * hsh.keep_if -> an_enumerator + * + * Deletes every key-value pair from hsh for which block + * evaluates to false. + * + * If no block is given, an enumerator is returned instead. + * + */ + +static int +keep_if_i(VALUE key, VALUE value, VALUE hash) +{ + if (key != Qundef) { + const bool ok = RTEST(rb_yield_values(2, key, value)); + ST_STOP_IF_BROKEN(); + if (!ok) { + return ST_DELETE; + } + } + return ST_CONTINUE; +} + +VALUE +rhash_keep_if(VALUE hash, SEL sel) +{ + RETURN_ENUMERATOR(hash, 0, 0); + rhash_modify(hash); + rhash_foreach(hash, keep_if_i, hash); + return hash; +} + +/* + * call-seq: * hsh.clear -> hsh * * Removes all key-value pairs from hsh. @@ -1123,12 +1157,8 @@ { VALUE ary = rb_ary_new(); rhash_foreach(hash, to_a_i, ary); - if (OBJ_TAINTED(hash)) { - OBJ_TAINT(ary); - } - if (OBJ_UNTRUSTED(hash)) { - OBJ_UNTRUST(ary); - } + OBJ_INFECT(ary, hash); + return ary; } @@ -1834,6 +1864,7 @@ rb_objc_define_method(rb_cRubyHash, "shift", rhash_shift, 0); rb_objc_define_method(rb_cRubyHash, "delete", rhash_delete, 1); rb_objc_define_method(rb_cRubyHash, "delete_if", rhash_delete_if, 0); + rb_objc_define_method(rb_cRubyHash, "keep_if", rhash_keep_if, 0); rb_objc_define_method(rb_cRubyHash, "select", rhash_select, 0); rb_objc_define_method(rb_cRubyHash, "reject", rhash_reject, 0); rb_objc_define_method(rb_cRubyHash, "reject!", rhash_reject_bang, 0); Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/hash/keep_if_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/hash/keep_if_tags.txt 2011-03-06 11:55:02 UTC (rev 5257) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/hash/keep_if_tags.txt 2011-03-07 06:11:34 UTC (rev 5258) @@ -1,6 +0,0 @@ -fails:Hash#keep_if yields two arguments: key and value -fails:Hash#keep_if keeps every entry for which block is true and returns self -fails:Hash#keep_if returns self even if unmodified -fails:Hash#keep_if raises an RuntimeError if called on a frozen instance -fails:Hash#keep_if returns an Enumerator if called on a non-empty hash without a block -fails:Hash#keep_if returns an Enumerator if called on an empty hash without a block

1 0

[5257] MacRuby/trunk/array.c
by source_changes＠macosforge.org 06 Mar '11

06 Mar '11

Revision: 5257 http://trac.macosforge.org/projects/ruby/changeset/5257 Author: watson1978(a)gmail.com Date: 2011-03-06 03:55:02 -0800 (Sun, 06 Mar 2011) Log Message: ----------- Array#fill(start, length) will raise a ArgumentError when was passed huge length. Test Script: {{{ require 'test/unit/assertions.rb' include Test::Unit::Assertions ary = [ "a", "b", "c" ] assert_raise(ArgumentError){ ary.fill("z", 0, 2**60) } puts :ok }}} Modified Paths: -------------- MacRuby/trunk/array.c Modified: MacRuby/trunk/array.c =================================================================== --- MacRuby/trunk/array.c 2011-03-06 11:08:26 UTC (rev 5256) +++ MacRuby/trunk/array.c 2011-03-06 11:55:02 UTC (rev 5257) @@ -2292,7 +2292,7 @@ return ary; } end = beg + len; - if (end < 0) { + if (beg >= ARY_MAX_SIZE || len > ARY_MAX_SIZE - beg) { rb_raise(rb_eArgError, "argument too big"); }

1 0

[5256] MacRuby/trunk/array.c
by source_changes＠macosforge.org 06 Mar '11

06 Mar '11

Revision: 5256 http://trac.macosforge.org/projects/ruby/changeset/5256 Author: watson1978(a)gmail.com Date: 2011-03-06 03:08:26 -0800 (Sun, 06 Mar 2011) Log Message: ----------- Array#rotate will not raise a SecurityError when $SAFE is 4. Test Script: {{{ require 'test/unit/assertions.rb' include Test::Unit::Assertions ary = [ "a", "b", "c" ] ret = nil Thread.start { $SAFE=4 ret = ["b", "c", "a"] == ary.rotate begin ary.rotate! rescue SecurityError => err else raise "error" end }.join assert_equal(true, ret) assert_equal(["a", "b", "c"], ary) puts :ok }}} Modified Paths: -------------- MacRuby/trunk/array.c Modified: MacRuby/trunk/array.c =================================================================== --- MacRuby/trunk/array.c 2011-03-06 08:34:38 UTC (rev 5255) +++ MacRuby/trunk/array.c 2011-03-06 11:08:26 UTC (rev 5256) @@ -1353,7 +1353,6 @@ VALUE ary_rotate(VALUE ary, long cnt) { - rb_ary_modify(ary); if (cnt != 0) { long len = RARY(ary)->len; if (len > 0 && (cnt = rotate_count(cnt, len)) > 0) { @@ -1399,6 +1398,7 @@ if (!NIL_P(n)) { cnt = NUM2LONG(n); } + rb_ary_modify(ary); ary_rotate(ary, cnt); return ary; }

1 0

[5255] MacRuby/trunk/array.c
by source_changes＠macosforge.org 06 Mar '11

06 Mar '11

Revision: 5255 http://trac.macosforge.org/projects/ruby/changeset/5255 Author: watson1978(a)gmail.com Date: 2011-03-06 00:34:38 -0800 (Sun, 06 Mar 2011) Log Message: ----------- Array#reverse will not raise a SecurityError when $SAFE is 4. Test Script: {{{ require 'test/unit/assertions.rb' include Test::Unit::Assertions ary = [ "a", "b", "c" ] ret = nil Thread.start { $SAFE=4 ret = ["c", "b", "a"] == ary.reverse begin ary.reverse! rescue SecurityError => err else raise "error" end }.join assert_equal(true, ret) assert_equal(["a", "b", "c"], ary) puts :ok }}} Modified Paths: -------------- MacRuby/trunk/array.c Modified: MacRuby/trunk/array.c =================================================================== --- MacRuby/trunk/array.c 2011-03-05 14:09:55 UTC (rev 5254) +++ MacRuby/trunk/array.c 2011-03-06 08:34:38 UTC (rev 5255) @@ -1319,7 +1319,17 @@ static VALUE rary_reverse(VALUE ary, SEL sel) { - return rary_reverse_bang(rary_dup(ary, 0), 0); + VALUE dup = rary_dup(ary, 0); + + if (RARY(dup)->len > 1) { + for (size_t i = 0; i < RARY(dup)->len / 2; i++) { + const size_t j = RARY(dup)->len - i - 1; + VALUE elem = rary_elt(dup, i); + rary_elt_set(dup, i, rary_elt(dup, j)); + rary_elt_set(dup, j, elem); + } + } + return dup; } static inline long

1 0

[5254] MacRuby/trunk/array.c
by source_changes＠macosforge.org 05 Mar '11

05 Mar '11

Revision: 5254 http://trac.macosforge.org/projects/ruby/changeset/5254 Author: watson1978(a)gmail.com Date: 2011-03-05 06:09:55 -0800 (Sat, 05 Mar 2011) Log Message: ----------- Array#insert will check the number of arguments at the beginning. Test Script: {{{ require 'test/unit/assertions.rb' include Test::Unit::Assertions assert_raise(ArgumentError) { [0].freeze.insert } puts :ok }}} Modified Paths: -------------- MacRuby/trunk/array.c Modified: MacRuby/trunk/array.c =================================================================== --- MacRuby/trunk/array.c 2011-03-05 03:05:02 UTC (rev 5253) +++ MacRuby/trunk/array.c 2011-03-05 14:09:55 UTC (rev 5254) @@ -1023,13 +1023,13 @@ static VALUE rary_insert_m(VALUE ary, SEL sel, int argc, VALUE *argv) { + if (argc < 1) { + rb_raise(rb_eArgError, "wrong number of arguments (at least 1)"); + } rary_modify(ary); if (argc == 1) { return ary; } - if (argc < 1) { - rb_raise(rb_eArgError, "wrong number of arguments (at least 1)"); - } long pos = NUM2LONG(argv[0]); if (pos == -1) { pos = RARRAY_LEN(ary);

1 0

[5253] MacRuby/trunk
by source_changes＠macosforge.org 05 Mar '11

05 Mar '11

Revision: 5253 http://trac.macosforge.org/projects/ruby/changeset/5253 Author: lsansonetti(a)apple.com Date: 2011-03-04 19:05:02 -0800 (Fri, 04 Mar 2011) Log Message: ----------- fix a bug when break expressions inside hash iterations wouldn't be taken into account Modified Paths: -------------- MacRuby/trunk/hash.c MacRuby/trunk/vm.h Modified: MacRuby/trunk/hash.c =================================================================== --- MacRuby/trunk/hash.c 2011-03-04 23:05:12 UTC (rev 5252) +++ MacRuby/trunk/hash.c 2011-03-05 03:05:02 UTC (rev 5253) @@ -760,7 +760,9 @@ delete_if_i(VALUE key, VALUE value, VALUE ary) { if (key != Qundef) { - if (RTEST(rb_yield_values(2, key, value))) { + const bool ok = RTEST(rb_yield_values(2, key, value)); + ST_STOP_IF_BROKEN(); + if (ok) { rb_ary_push(ary, key); } } @@ -850,7 +852,9 @@ select_i(VALUE key, VALUE value, VALUE result) { if (key != Qundef) { - if (RTEST(rb_yield_values(2, key, value))) { + const bool ok = RTEST(rb_yield_values(2, key, value)); + ST_STOP_IF_BROKEN(); + if (ok) { rb_hash_aset(result, key, value); } } @@ -1011,6 +1015,7 @@ { if (key != Qundef) { rb_yield(value); + ST_STOP_IF_BROKEN(); } return ST_CONTINUE; } @@ -1044,6 +1049,7 @@ { if (key != Qundef) { rb_yield(key); + ST_STOP_IF_BROKEN(); } return ST_CONTINUE; } @@ -1079,6 +1085,7 @@ { if (key != Qundef) { rb_yield(rb_assoc_new(key, value)); + ST_STOP_IF_BROKEN(); } return ST_CONTINUE; } @@ -1488,6 +1495,7 @@ if (key != Qundef) { if (rhash_has_key(hash, 0, key)) { value = rb_yield_values(3, key, rhash_aref(hash, 0, key), value); + ST_STOP_IF_BROKEN(); } rhash_aset(hash, 0, key, value); } Modified: MacRuby/trunk/vm.h =================================================================== --- MacRuby/trunk/vm.h 2011-03-04 23:05:12 UTC (rev 5252) +++ MacRuby/trunk/vm.h 2011-03-05 03:05:02 UTC (rev 5253) @@ -515,6 +515,15 @@ VALUE rb_vm_get_broken_value(void *vm); VALUE rb_vm_returned_from_block(void *_vm, int id); +#define ST_STOP_IF_BROKEN() \ + do { \ + VALUE __v = rb_vm_get_broken_value(rb_vm_current_vm()); \ + if (__v != Qundef) { \ + return ST_STOP; \ + } \ + } \ + while (0) + VALUE rb_vm_pop_broken_value(void); #define RETURN_IF_BROKEN() \ do { \

1 0

[5252] MacRuby/trunk/string.c
by source_changes＠macosforge.org 04 Mar '11

04 Mar '11

Revision: 5252 http://trac.macosforge.org/projects/ruby/changeset/5252 Author: watson1978(a)gmail.com Date: 2011-03-04 15:05:12 -0800 (Fri, 04 Mar 2011) Log Message: ----------- String#+ will concatenate only strings. Test Script: {{{ require 'test/unit/assertions.rb' include Test::Unit::Assertions assert_equal("foobar", "foo" + "bar" ) assert_raise(TypeError){ "foo" + :bar } puts :ok }}} Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2011-03-04 11:55:41 UTC (rev 5251) +++ MacRuby/trunk/string.c 2011-03-04 23:05:12 UTC (rev 5252) @@ -2533,6 +2533,8 @@ static VALUE rstr_plus(VALUE self, SEL sel, VALUE other) { + StringValue(other); + rb_str_t *newstr = str_dup(RSTR(self)); rb_str_t *otherstr = str_need_string(other); str_concat_string(newstr, otherstr);

1 0

[5251] MacRuby/trunk/lib/uri/common.rb
by source_changes＠macosforge.org 04 Mar '11

04 Mar '11

Revision: 5251 http://trac.macosforge.org/projects/ruby/changeset/5251 Author: watson1978(a)gmail.com Date: 2011-03-04 03:55:41 -0800 (Fri, 04 Mar 2011) Log Message: ----------- URI::WFKV_: get rid of backtrack explosion by nested repeat operators. Merged frome CRuby 1.9 r30306. see https://github.com/ruby/ruby/commit/c9d697ab7842e5672579cfb0e9bd0594ff95fe19 Revision Links: -------------- http://trac.macosforge.org/projects/ruby/changeset/30306 Modified Paths: -------------- MacRuby/trunk/lib/uri/common.rb Modified: MacRuby/trunk/lib/uri/common.rb =================================================================== --- MacRuby/trunk/lib/uri/common.rb 2011-03-04 07:40:56 UTC (rev 5250) +++ MacRuby/trunk/lib/uri/common.rb 2011-03-04 11:55:41 UTC (rev 5251) @@ -801,7 +801,7 @@ str end - WFKV_ = '(?:%\h\h|[^%#=;&]+)' # :nodoc: + WFKV_ = '(?:%\h\h|[^%#=;&])' # :nodoc: # Decode URL-encoded form data from given +str+. #

1 0

[5250] MacRuby/trunk/io.c
by source_changes＠macosforge.org 04 Mar '11

04 Mar '11

Revision: 5250 http://trac.macosforge.org/projects/ruby/changeset/5250 Author: watson1978(a)gmail.com Date: 2011-03-03 23:40:56 -0800 (Thu, 03 Mar 2011) Log Message: ----------- IO#try_convert will raise TypeError if the object does not return an IO from #to_io. Test Script: {{{ require 'test/unit/assertions.rb' include Test::Unit::Assertions obj = Object.new def obj.to_io 'foo' end assert_raise(TypeError){ IO.try_convert(obj) } puts :ok }}} Modified Paths: -------------- MacRuby/trunk/io.c Modified: MacRuby/trunk/io.c =================================================================== --- MacRuby/trunk/io.c 2011-03-04 07:40:52 UTC (rev 5249) +++ MacRuby/trunk/io.c 2011-03-04 07:40:56 UTC (rev 5250) @@ -3597,9 +3597,7 @@ static VALUE rb_io_s_try_convert(VALUE dummy, SEL sel, VALUE obj) { - return rb_respond_to(obj, rb_intern("to_io")) - ? rb_funcall3(obj, rb_intern("to_io"), 0, 0) - : Qnil; + return rb_io_check_io(obj); } /*

1 0