diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-11-07 19:18:16 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-11-07 19:18:16 +0000 |
| commit | 4b37ef828031a3f9cb8281a2d583f559abdd71a1 (patch) | |
| tree | a78adc8cdeb42f4a59788e2e5dda13627a130446 /lib/set.rb | |
| parent | 211a0b556843c1c6aed8069d8b231db86b321cd2 (diff) | |
| download | ruby-4b37ef828031a3f9cb8281a2d583f559abdd71a1.tar.gz ruby-4b37ef828031a3f9cb8281a2d583f559abdd71a1.tar.xz ruby-4b37ef828031a3f9cb8281a2d583f559abdd71a1.zip | |
* class.c (rb_define_method): do not set NOEX_CFUNC if klass is
really a module, whose methods must be safe for reciever's type.
* eval.c (rb_eval): nosuper should not be inherited unless the
overwritten method is an undef placeholder.
* parse.y (primary): allow 'when'-less case statement; persuaded
by Sean Chittenden.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@3032 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/set.rb')
| -rw-r--r-- | lib/set.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/set.rb b/lib/set.rb index 945bdd7c9..ec4037a17 100644 --- a/lib/set.rb +++ b/lib/set.rb @@ -265,7 +265,7 @@ class Set def flatten_merge(set, seen = Set.new) set.each { |e| if e.is_a?(Set) - if seen.include?(e_id = e.id) + if seen.include?(e_id = e.object_id) raise ArgumentError, "tried to flatten recursive Set" end |