Update for swift 3

Author: wty21cn

leetcode-swift.xcodeproj/project.pbxproj

@@ -379,6 +379,7 @@
 				TargetAttributes = {
 					B76B77D61D281C190093657C = {
 						CreatedOnToolsVersion = 7.3.1;
+						LastSwiftMigration = 0800;
 					};
 				};
 			};
@@ -574,13 +575,15 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
 		B76B77E01D281C190093657C /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};

leetcode-swift/Easy/q007-reverse-integer.swift

@@ -39,7 +39,7 @@ import Foundation
 struct q007 {
 
     class Solution {
-        func reverse(x: Int) -> Int {
+        func reverse(_ x: Int) -> Int {
             var x = x
             var reversedX = 0
             while x != 0 {
@@ -58,4 +58,4 @@ struct q007 {
         print(Solution().reverse(9223372036854774999))
         print(Solution().reverse(-2147483412))
     }
-}
+}

leetcode-swift/Easy/q009-palindrome-number.swift

@@ -35,7 +35,7 @@ import Foundation
 struct q9 {
 
     class Solution {
-        func isPalindrome(x: Int) -> Bool {
+        func isPalindrome(_ x: Int) -> Bool {
             if x < 0 || x % 10 == 0 {
                  return x == 0
             } 
@@ -57,4 +57,4 @@ struct q9 {
         print(Solution().isPalindrome(10))
 
     }
-}
+}

leetcode-swift/Easy/q013-roman-to-integer.swift

@@ -32,17 +32,37 @@
 
 
 import Foundation
+fileprivate func < <T : Comparable>(lhs: T?, rhs: T?) -> Bool {
+  switch (lhs, rhs) {
+  case let (l?, r?):
+    return l < r
+  case (nil, _?):
+    return true
+  default:
+    return false
+  }
+}
+
+fileprivate func > <T : Comparable>(lhs: T?, rhs: T?) -> Bool {
+  switch (lhs, rhs) {
+  case let (l?, r?):
+    return l > r
+  default:
+    return rhs < lhs
+  }
+}
+
 
 struct q13 {
 
     class Solution {
-        func romanToInt(s: String) -> Int {
+        func romanToInt(_ s: String) -> Int {
 
             let romanUnit = [Character("I"):1, Character("V"):5, Character("X"):10,
                              Character("L"):50, Character("C"):100, Character("D"):500,
                              Character("M"):1000]
 
-            let reversedChars = s.characters.reverse()
+            let reversedChars = s.characters.reversed()
             var integer = 0
             var index = reversedChars.startIndex
             while index != reversedChars.endIndex {
@@ -73,4 +93,4 @@ struct q13 {
     static func getSolution() -> Void {
         print(Solution().romanToInt("MCMXCVI"))
     }
-}
+}

leetcode-swift/Easy/q014-longest-common-prefix.swift

@@ -23,7 +23,7 @@ import Foundation
 struct q14 {
 
     class Solution {
-        func longestCommonPrefix(strs: [String]) -> String {
+        func longestCommonPrefix(_ strs: [String]) -> String {
             var s: String?          //Find the shortest string
             var length = Int.max    //Shortest string's length
 
@@ -35,10 +35,10 @@ struct q14 {
             }
 
             if var s = s {
-                var subrange = s.startIndex..<s.endIndex
+                var subrange = s.characters.indices
                 for str in strs {
                     while !s.isEmpty && !str.hasPrefix(s) {
-                        subrange.endIndex = subrange.endIndex.predecessor()
+                        subrange.upperBound = <#T##Collection corresponding to your index##Collection#>.index(before: subrange.upperBound)
                         s = s[subrange]
                     }
                 }
@@ -52,4 +52,4 @@ struct q14 {
     static func getSolution() -> Void {
         print(Solution().longestCommonPrefix(["ab","ac","abc","abcd"]))
     }
-}
+}

leetcode-swift/Easy/q019-remove-nth-node-from-end-of-list.swift

@@ -33,7 +33,7 @@ import Foundation
 struct q19 {
 
     class Solution {
-        func removeNthFromEnd(head: ListNode?, _ n: Int) -> ListNode? {
+        func removeNthFromEnd(_ head: ListNode?, _ n: Int) -> ListNode? {
             if head == nil { return nil }
 
             var fastPtr = head, slowPtr = head
@@ -57,4 +57,4 @@ struct q19 {
         let head = LinkedListHelper.buildLinkedList(withNodes: [1,2,3,4,5,6,7])
         print(Solution().removeNthFromEnd(head, 1))
     }
-}
+}

leetcode-swift/Easy/q020-valid-parentheses.swift

@@ -27,17 +27,17 @@ import Foundation
 struct q20 {
 
     class Solution {
-        func isValid(s: String) -> Bool {
+        func isValid(_ s: String) -> Bool {
             let rule = Array("()[]{}".characters)
             var stack = [Character]()
-            for (_, char) in s.characters.enumerate() {
-                if rule.indexOf(char)! % 2 == 0 {    // open brackets
+            for (_, char) in s.characters.enumerated() {
+                if rule.index(of: char)! % 2 == 0 {    // open brackets
                     stack.append(char)
                 } else {                            // close brackets
                     if stack.isEmpty {
                         return false
                     } else {
-                        if rule.indexOf(char)! - rule.indexOf(stack.last!)! == 1 {  //barckets matched
+                        if rule.index(of: char)! - rule.index(of: stack.last!)! == 1 {  //barckets matched
                             stack.removeLast()
                         } else {
                             return false
@@ -58,4 +58,4 @@ struct q20 {
 
 
     }
-}
+}

leetcode-swift/Easy/q021-merge-two-sorted-lists.swift

@@ -25,7 +25,7 @@ import Foundation
 struct q21 {
 
     class Solution {
-        func mergeTwoLists(l1: ListNode?, _ l2: ListNode?) -> ListNode? {
+        func mergeTwoLists(_ l1: ListNode?, _ l2: ListNode?) -> ListNode? {
 
             if l1 == nil { return l2 }
             if l2 == nil { return l1 }
@@ -67,4 +67,4 @@ struct q21 {
         print(Solution().mergeTwoLists(l1, l2))
 
     }
-}
+}

leetcode-swift/Easy/q024-swap-nodes-in-pairs.swift

@@ -16,7 +16,7 @@ import Foundation
 struct q24 {
 
     class Solution {
-        func swapPairs(head: ListNode?) -> ListNode? {
+        func swapPairs(_ head: ListNode?) -> ListNode? {
 
             var p: ListNode? = nil
             var i = head
@@ -44,4 +44,4 @@ struct q24 {
 
         print(Solution().swapPairs(head))
     }
-}
+}

leetcode-swift/Easy/q026-remove-duplicates-from-sorted-array.swift

@@ -31,7 +31,7 @@ import Foundation
 struct q26 {
 
     class Solution {
-        func removeDuplicates(inout nums: [Int]) -> Int {
+        func removeDuplicates(_ nums: inout [Int]) -> Int {
             if nums.isEmpty {
                 return 0
             }
@@ -57,4 +57,4 @@ struct q26 {
             print(array[i], terminator: " ")
         }
     }
-}
+}