Merge pull request kodecocodes#196 from nemanjavlahovic/stack-nemanja

Updating Stack to Swift 3

Author: Chris Pilcher

.travis.yml

@@ -9,9 +9,9 @@ install:
 script:
 
 # - xcodebuild test -project ./All-Pairs\ Shortest\ Paths/APSP/APSP.xcodeproj -scheme APSPTests
- - xcodebuild test -project ./Array2D/Tests/Tests.xcodeproj -scheme Tests
- - xcodebuild test -project ./AVL\ Tree/Tests/Tests.xcodeproj -scheme Tests
- - xcodebuild test -project ./Binary\ Search/Tests/Tests.xcodeproj -scheme Tests
+  - xcodebuild test -project ./Array2D/Tests/Tests.xcodeproj -scheme Tests
+  - xcodebuild test -project ./AVL\ Tree/Tests/Tests.xcodeproj -scheme Tests
+  - xcodebuild test -project ./Binary\ Search/Tests/Tests.xcodeproj -scheme Tests
 # - xcodebuild test -project ./Binary\ Search\ Tree/Solution\ 1/Tests/Tests.xcodeproj -scheme Tests
 # - xcodebuild test -project ./Bloom\ Filter/Tests/Tests.xcodeproj -scheme Tests
 # - xcodebuild test -project ./Bounded\ Priority\ Queue/Tests/Tests.xcodeproj -scheme Tests
@@ -37,5 +37,5 @@ script:
 # - xcodebuild test -project ./Shell\ Sort/Tests/Tests.xcodeproj -scheme Tests
 # - xcodebuild test -project ./Shortest\ Path\ \(Unweighted\)/Tests/Tests.xcodeproj -scheme Tests
 # - xcodebuild test -project ./Single-Source\ Shortest\ Paths\ \(Weighted\)/SSSP.xcodeproj -scheme SSSPTests
-# - xcodebuild test -project ./Stack/Tests/Tests.xcodeproj -scheme Tests
+  - xcodebuild test -project ./Stack/Tests/Tests.xcodeproj -scheme Tests
 # - xcodebuild test -project ./Topological\ Sort/Tests/Tests.xcodeproj -scheme Tests

Stack/README.markdown

@@ -42,7 +42,7 @@ A stack is easy to create in Swift. It's just a wrapper around an array that jus
 
 ```swift
 public struct Stack<T> {
-  private var array = [T]()
+  fileprivate var array = [T]()
 
   public var isEmpty: Bool {
     return array.isEmpty
@@ -52,7 +52,7 @@ public struct Stack<T> {
     return array.count
   }
 
-  public mutating func push(element: T) {
+  public mutating func push(_ element: T) {
     array.append(element)
   }
 

Stack/Stack.playground/Contents.swift

@@ -12,7 +12,7 @@
 */
 
 public struct Stack<T> {
-  private var array = [T]()
+  fileprivate var array = [T]()
 
   public var count: Int {
     return array.count
@@ -22,7 +22,7 @@ public struct Stack<T> {
     return array.isEmpty
   }
 
-  public mutating func push(element: T) {
+  public mutating func push(_ element: T) {
     array.append(element)
   }
 

Stack/Stack.swift

@@ -4,7 +4,7 @@
   Push and pop are O(1) operations.
 */
 public struct Stack<T> {
-  private var array = [T]()
+  fileprivate var array = [T]()
 
   public var isEmpty: Bool {
     return array.isEmpty
@@ -14,7 +14,7 @@ public struct Stack<T> {
     return array.count
   }
 
-  public mutating func push(element: T) {
+  public mutating func push(_ element: T) {
     array.append(element)
   }
 
@@ -27,10 +27,10 @@ public struct Stack<T> {
   }
 }
 
-extension Stack: SequenceType {
-    public func generate() -> AnyGenerator<T> {
+extension Stack: Sequence {
+    public func makeIterator() -> AnyIterator<T> {
         var curr = self
-        return AnyGenerator {
+        return AnyIterator {
             _ -> T? in
             return curr.pop()
         }

Stack/Tests/Tests.xcodeproj/project.pbxproj

@@ -83,11 +83,12 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0720;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = "Swift Algorithm Club";
 				TargetAttributes = {
 					7B2BBC7F1C779D720067B71D = {
 						CreatedOnToolsVersion = 7.2;
+						LastSwiftMigration = 0800;
 					};
 				};
 			};
@@ -145,8 +146,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";
@@ -189,8 +192,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";
@@ -209,6 +214,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 			};
 			name = Release;
 		};
@@ -220,6 +226,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = swift.algorithm.club.Tests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -231,6 +238,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = swift.algorithm.club.Tests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};

Stack/Tests/Tests.xcodeproj/xcshareddata/xcschemes/Tests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"