diff options
author | marcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-09-15 21:30:50 +0000 |
---|---|---|
committer | marcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-09-15 21:30:50 +0000 |
commit | 1796522f10e4bee3db8df77fa66f749084592285 (patch) | |
tree | 8efee8e6cc94d15eb0206a5837830290e4cfee22 /test/ruby | |
parent | 6a54d4b6fe2cc397716080a01394f75c6b6cfb4a (diff) | |
download | ruby-1796522f10e4bee3db8df77fa66f749084592285.tar.gz |
* thread.c (rb_exec_recursive_outer, rb_exec_recursive): Added method to short-circuit to the outermost level in case of recursion
* test/ruby/test_thread.rb (test_recursive_outer): Test for above
* hash.c (rb_hash_hash): Return a sensible hash for in case of recursion [ruby-core:24648]
* range.c (rb_range_hash): ditto
* struct.c (rb_struct_hash): ditto
* array.c (rb_array_hash): ditto
* test/ruby/test_array.rb (test_hash2): test for above
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24943 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/ruby')
-rw-r--r-- | test/ruby/test_array.rb | 3 | ||||
-rw-r--r-- | test/ruby/test_thread.rb | 13 |
2 files changed, 15 insertions, 1 deletions
diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb index 2723b37c6a..fd3b98432d 100644 --- a/test/ruby/test_array.rb +++ b/test/ruby/test_array.rb @@ -1572,7 +1572,8 @@ class TestArray < Test::Unit::TestCase def test_hash2 a = [] a << a - assert_raise(ArgumentError) { a.hash } + assert_equal([[a]].hash, a.hash) + assert_not_equal([a, a].hash, a.hash) # Implementation dependent end def test_flatten2 diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb index d0c35d8273..397da2c3f7 100644 --- a/test/ruby/test_thread.rb +++ b/test/ruby/test_thread.rb @@ -458,6 +458,19 @@ class TestThread < Test::Unit::TestCase end assert_raise(TypeError) { [o].inspect } end + + def test_recursive_outer + arr = [] + obj = Struct.new(:foo, :visited).new(arr, false) + arr << obj + def obj.hash + self[:visited] = true + super + raise "recursive_outer should short circuit intermediate calls" + end + assert_nothing_raised {arr.hash} + assert(obj[:visited]) + end end class TestThreadGroup < Test::Unit::TestCase |