update for beta 3

Author: mattneub

bk1ch01p015yourFirstInstance/bk1ch01p015yourFirstInstance/ViewController.swift

@@ -51,9 +51,9 @@ class ViewController: UIViewController {
 
         let sum = 1 + 2
         let x = 1.successor()
-        let y = "hello".generate()
 
-        let _ = (sum,x,y) // shut the compiler up
+        _ = sum
+        _ = x
 
         1.sayHello() // outputs: "Hello, I'm 1"
 

bk1ch02p028basicFunctions/bk1ch02p28basicFunctions/ViewController.swift

@@ -13,11 +13,12 @@ func say1(s:String) -> Void { print(s) }
 func say2(s:String) -> () { print(s) }
 func say3(s:String) { print(s) }
 
+// crazy but true
 
-func greet1(Void) -> String { return "howdy" }
+func greet1(unused:Void) -> String { return "howdy" }
 func greet2() -> String { return "howdy" }
 
-func greeet1(Void) -> Void { print("howdy") }
+func greeet1(unused:Void) -> Void { print("howdy") }
 func greeet2() -> () { print("howdy") }
 func greeet3() { print("howdy") }
 
@@ -45,10 +46,21 @@ class ViewController: UIViewController {
 
         print(z2)
 
+        say1("howdy")
+        say2("howdy")
+        say3("howdy")
+        greet1()
+        greet2()
+        greeet1()
+        greeet2()
+        greeet3()
+        
         let pointless : Void = say1("howdy") // showing that we actually return void
         print("pointless is \(pointless)") // showing that we captured the returned void
 
-        
+        let v : Void = () // passing a void is the same as no parameters
+        greet1(v)
+        greet2(v)
 
 
     }

bk1ch03p095tuple/bk1ch03p095tuple/ViewController.swift

@@ -116,8 +116,15 @@ class ViewController: UIViewController {
             f2(tuple)
         }
 
+        do {
+//            var tuple = (i1:1, i2:2)
+//            f2(tuple) // compile error
+        }
+        
         do { // examples from the dev forums
 
+            /*
+            
             var array: [(Int, Int)] = []
 
             // OK - literals
@@ -132,12 +139,45 @@ class ViewController: UIViewController {
             array.append(const_tuple)
 
             // NOK - var integer
-            // var int_var = 1
-            // array.append(int_var, 1)
+             var int_var = 1
+             array.append(int_var, 1)
 
             // NOK - var tuple
-            // var var_tuple: (Int, Int) = (1, 1)
-            // array.append(var_tuple)
+             var var_tuple: (Int, Int) = (1, 1)
+             array.append(var_tuple)
+
+            */
+            
+            // However, this changed in Swift 2.0 beta 3:
+            // New! You can now write it like a tuple!
+            // parentheses in parentheses
+
+            
+            var array: [(Int, Int)] = []
+            
+            
+            // OK - literals
+            array.append((1,1))
+            
+            // OK - let integer
+            let int_const = 1
+            array.append((int_const, 1))
+            
+            // OK - let tuple
+            let const_tuple: (Int, Int) = (1, 1)
+            array.append(const_tuple)
+            
+            // OK - var integer
+            var int_var = 1
+            array.append((int_var, 1))
+            
+            // OK - var tuple
+            var var_tuple: (Int, Int) = (1, 1)
+            array.append(var_tuple)
+
+            // shut the compiler up
+            int_var = 0
+            var_tuple = (0,0)
 
         }
 

bk1ch04p181optionalProtocolMembers/bk1ch04p181optionalProtocolMembers/ViewController.swift

@@ -49,11 +49,12 @@ class ViewController: UIViewController {
         super.init(nibName: "ViewController", bundle: nil)
     }
 
-    required init(coder aDecoder: NSCoder) {
+    required init?(coder aDecoder: NSCoder) {
         // fatalError("init(coder:) has not been implemented")
         super.init(coder:aDecoder)
     }
 
+    
     // inappropriate here, but a legal alternative:
 
 //    required convenience init(coder aDecoder: NSCoder) {

bk1ch04p196extensions/bk1ch04p196extensions/ViewController.swift

@@ -58,8 +58,8 @@ extension Dog where T : Equatable {
 
 }
 
-extension Array where T:Comparable {
-    func min() -> T {
+extension Array where Element:Comparable {
+    func min() -> Element {
         var minimum = self[0]
         for ix in 1..<self.count {
             if self[ix] < minimum {

bk1ch04p222sets/bk1ch04p222sets/ViewController.swift

@@ -32,6 +32,7 @@ class ViewController: UIViewController {
 
         do {
             let opts = UIViewAnimationOptions(rawValue:0b00011000)
+            _ = opts
         }
 
         do {

bk1ch05p227branching/bk1ch05p227branching/ViewController.swift

@@ -111,7 +111,7 @@ class ViewController: UIViewController {
 
 class C1 : NSObject {
     override func observeValueForKeyPath(keyPath: String?,
-        ofObject object: AnyObject?, change: [NSObject : AnyObject]?,
+        ofObject object: AnyObject?, change: [String : AnyObject]?,
         context: UnsafeMutablePointer<()>) {
             if keyPath == "readyForDisplay" {
                 if let obj = object as? AVPlayerViewController {
@@ -128,7 +128,7 @@ class C1 : NSObject {
 
 class C2 : NSObject {
     override func observeValueForKeyPath(keyPath: String?,
-        ofObject object: AnyObject?, change: [NSObject : AnyObject]?,
+        ofObject object: AnyObject?, change: [String : AnyObject]?,
         context: UnsafeMutablePointer<()>) {
             if keyPath == "readyForDisplay",
                 let obj = object as? AVPlayerViewController,
@@ -141,7 +141,7 @@ class C2 : NSObject {
 
 class C3 : NSObject {
     override func observeValueForKeyPath(keyPath: String?,
-        ofObject object: AnyObject?, change: [NSObject : AnyObject]?,
+        ofObject object: AnyObject?, change: [String : AnyObject]?,
         context: UnsafeMutablePointer<()>) {
             guard keyPath == "readyForDisplay" else {return}
             guard let obj = object as? AVPlayerViewController else {return}

bk1ch05p254memoryManagement/bk1ch05p254memoryManagement/ViewController.swift

@@ -74,6 +74,9 @@ class ViewController: UIViewController {
                 }
                 let d = Dog()
                 let c = Cat()
+                
+                _ = d
+                _ = c
             }
             testRetainCycle() // farewell from Cat, farewell from Dog
         }