From 12f9e1b64d2044031bed427ebffd6d225d05fc22 Mon Sep 17 00:00:00 2001 From: knu Date: Thu, 2 Nov 2006 05:45:12 +0000 Subject: [PATCH] * lib/set.rb (Set#^): Fix XOR operation against a container that holds duplicate values. [issue: #6444] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11263 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/set.rb | 11 +++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3bb07ee2d0..056f30fd15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Nov 2 14:19:44 2006 Akinori MUSHA + + * lib/set.rb (Set#^): Fix XOR operation against a container that + holds duplicate values. [issue: #6444] + Thu Nov 2 10:00:06 2006 Yukihiro Matsumoto * string.c: class Symbol is no longer subclass of String. also diff --git a/lib/set.rb b/lib/set.rb index ace02e08f2..66ffc898a1 100644 --- a/lib/set.rb +++ b/lib/set.rb @@ -294,8 +294,8 @@ class Set # and the given enumerable object. (set ^ enum) is equivalent to # ((set | enum) - (set & enum)). def ^(enum) - n = dup - enum.each { |o| if n.include?(o) then n.delete(o) else n.add(o) end } + n = Set.new(enum) + each { |o| if n.include?(o) then n.delete(o) else n.add(o) end } n end @@ -1039,6 +1039,13 @@ class TC_Set < Test::Unit::TestCase assert_equal(Set[2,4], ret) end + def test_xor + set = Set[1,2,3,4] + ret = set ^ [2,4,5,5] + assert_not_same(set, ret) + assert_equal(Set[1,3,5], ret) + end + def test_eq set1 = Set[2,3,1] set2 = Set[1,2,3]