Change NSMutableSet to align with Darwin version

Author: SowmyaVikram

Foundation/NSPredicate.swift

@@ -112,7 +112,7 @@ extension NSMutableSet {
     public func filterUsingPredicate(_ predicate: NSPredicate) {
         for object in self {
             if !predicate.evaluateWithObject(object) {
-                self.removeObject(object)
+                self.remove(object)
             }
         }
     } // evaluate a predicate against a set of objects and filter the mutable set directly

Foundation/NSSet.swift

@@ -354,15 +354,15 @@ extension NSSet : Sequence {
 
 public class NSMutableSet : NSSet {
 
-    public func addObject(_ object: AnyObject) {
+    public func add(_ object: AnyObject) {
         if self.dynamicType === NSMutableSet.self {
             _storage.insert(object as! NSObject)
         } else {
             NSRequiresConcreteImplementation()
         }
     }
 
-    public func removeObject(_ object: AnyObject) {
+    public func remove(_ object: AnyObject) {
         if self.dynamicType === NSMutableSet.self {
             if let obj = object as? NSObject {
                 _storage.remove(obj)
@@ -384,17 +384,17 @@ public class NSMutableSet : NSSet {
         super.init(objects: [], count: 0)
     }
 
-    public required convenience init?(coder: NSCoder) {
+    public required convenience init?(coder aDecoder: NSCoder) {
         NSUnimplemented()
     }
 
-    public func addObjectsFromArray(_ array: [AnyObject]) {
+    public func addObjects(from array: [AnyObject]) {
         if self.dynamicType === NSMutableSet.self {
             for case let obj as NSObject in array {
                 _storage.insert(obj)
             }
         } else {
-            array.forEach(addObject)
+            array.forEach(add)
         }
     }
 
@@ -403,32 +403,32 @@ public class NSMutableSet : NSSet {
             _storage.formIntersection(otherSet)
         } else {
             for case let obj as NSObject in self where !otherSet.contains(obj) {
-                removeObject(obj)
+                remove(obj)
             }
         }
     }
 
-    public func minusSet(_ otherSet: Set<NSObject>) {
+    public func minus(_ otherSet: Set<NSObject>) {
         if self.dynamicType === NSMutableSet.self {
             _storage.subtract(otherSet)
         } else {
-            otherSet.forEach(removeObject)
+            otherSet.forEach(remove)
         }
     }
 
     public func removeAllObjects() {
         if self.dynamicType === NSMutableSet.self {
             _storage.removeAll()
         } else {
-            forEach(removeObject)
+            forEach(remove)
         }
     }
 
-    public func unionSet(_ otherSet: Set<NSObject>) {
+    public func union(_ otherSet: Set<NSObject>) {
         if self.dynamicType === NSMutableSet.self {
             _storage.formUnion(otherSet)
         } else {
-            otherSet.forEach(addObject)
+            otherSet.forEach(add)
         }
     }
 
@@ -437,7 +437,7 @@ public class NSMutableSet : NSSet {
             _storage = otherSet
         } else {
             removeAllObjects()
-            unionSet(otherSet)
+            union(otherSet)
         }
     }
 
@@ -507,7 +507,7 @@ public class NSCountedSet : NSMutableSet {
         }
     }
 
-    public override func addObject(_ object: AnyObject) {
+    public override func add(_ object: AnyObject) {
         if self.dynamicType === NSCountedSet.self {
             if let count = _table[object as! NSObject] {
                 _table[object as! NSObject] = count + 1
@@ -520,7 +520,7 @@ public class NSCountedSet : NSMutableSet {
         }
     }
 
-    public override func removeObject(_ object: AnyObject) {
+    public override func remove(_ object: AnyObject) {
         if self.dynamicType === NSCountedSet.self {
             guard let count = _table[object as! NSObject] else {
                 return
@@ -541,7 +541,7 @@ public class NSCountedSet : NSMutableSet {
             _storage.removeAll()
             _table.removeAll()
         } else {
-            forEach(removeObject)
+            forEach(remove)
         }
     }
 }

TestFoundation/TestNSFileManager.swift

@@ -211,7 +211,7 @@ class TestNSFileManager : XCTestCase {
         if let e = NSFileManager.defaultManager().enumerator(atPath: basePath) {
             let foundItems = NSMutableSet()
             while let item = e.nextObject() as? NSString {
-                foundItems.addObject(item)
+                foundItems.add(item)
             }
             XCTAssertEqual(foundItems, NSMutableSet(array: ["item".bridge(),"path2".bridge(),"path2/item".bridge()]))
         } else {

TestFoundation/TestNSSet.swift

@@ -84,7 +84,7 @@ class TestNSSet : XCTestCase {
 
     func test_setOperations() {
         let set = NSMutableSet(array: ["foo", "bar"].bridge().bridge())
-        set.unionSet(["bar".bridge(), "baz".bridge()])
+        set.union(["bar".bridge(), "baz".bridge()])
         XCTAssertTrue(set.isEqualToSet(["foo".bridge(), "bar".bridge(), "baz".bridge()]))
     }
 
@@ -185,9 +185,9 @@ class TestNSSet : XCTestCase {
 
         XCTAssertEqual(set.countForObject(v1), 2)
         XCTAssertEqual(set.countForObject(v2), 1)
-        set.addObject(v3asv1)
+        set.add(v3asv1)
         XCTAssertEqual(set.countForObject(v1), 3)
-        set.addObjectsFromArray([v1,v2])
+        set.addObjects(from: [v1,v2])
         XCTAssertEqual(set.countForObject(v1), 4)
         XCTAssertEqual(set.countForObject(v2), 2)
     }
@@ -200,10 +200,10 @@ class TestNSSet : XCTestCase {
 
         XCTAssertEqual(set.countForObject(v1), 2)
         XCTAssertEqual(set.countForObject(v2), 1)
-        set.removeObject(v2)
+        set.remove(v2)
         XCTAssertEqual(set.countForObject(v2), 0)
         XCTAssertEqual(set.countForObject(v1), 2)
-        set.removeObject(v2)
+        set.remove(v2)
         XCTAssertEqual(set.countForObject(v2), 0)
         XCTAssertEqual(set.countForObject(v1), 2)
         set.removeAllObjects()
@@ -227,4 +227,4 @@ class TestNSSet : XCTestCase {
         }
     }
 
-}
+}