adopt firstIndex instead of index (and test lastIndex); this means we can also remove the word where:

mattneub · mattneub · commit 27c5e0cb5322 · 2018-08-06T16:11:19.000-07:00
diff --git a/bk1ch02p038modifiableParameters/bk1ch02p038modifiableParameters/ViewController.swift b/bk1ch02p038modifiableParameters/bk1ch02p038modifiableParameters/ViewController.swift
@@ -35,7 +35,7 @@ func say(s:String, times:Int, loudly:Bool) {
 func removeCharacterNot(_ c:Character, from s:String) -> Int {
     var s = s
     var howMany = 0
-    while let ix = s.index(of:c) { // no more characters
+    while let ix = s.firstIndex(of:c) { // no more characters
         s.remove(at:ix)
         howMany += 1
     }
@@ -46,7 +46,7 @@ func removeCharacterNot(_ c:Character, from s:String) -> Int {
 
 func removeCharacter(_ c:Character, from s: inout String) -> Int {
     var howMany = 0
-    while let ix = s.index(of:c) { // no more characters
+    while let ix = s.firstIndex(of:c) { // no more characters
         s.remove(at:ix)
         howMany += 1
     }
diff --git a/bk1ch03p092characterAndRange/bk1ch03p092stringAndRange/ViewController.swift b/bk1ch03p092characterAndRange/bk1ch03p092stringAndRange/ViewController.swift
@@ -94,10 +94,13 @@ class ViewController: UIViewController {
         
         do {
             let s = "hello"
-            let firstL = s.index(of:"l")
+            let firstL = s.firstIndex(of:"l")
             print(firstL as Any) // Optional(2), meaning the third character
-            let lastL = String(s.reversed()).index(of:"l")
+            let lastL = String(s.reversed()).firstIndex(of:"l")
             print(lastL as Any)
+            // haha, but we no longer need that trick
+            let lastL2 = s.lastIndex(of:"l")
+            print(lastL2 as Any)
         }
         
         do {
@@ -108,19 +111,10 @@ class ViewController: UIViewController {
             // ...the compiler thinks this is `index(ofAccessibilityElement:)` and you get a weird answer
         }
         
-        // workaround
-        /*
-        do {
-            let s = "hello"
-            let firstSmall = s.characters.index {$0 < "f"}
-            print(firstSmall as Any)
-        }
- */
-        
-        // another workaround
+        // but the new firstIndex doesn't have that problem
         do {
             let s = "hello"
-            let firstSmall = s.index(where: {$0 < "f"})
+            let firstSmall = s.firstIndex {$0 < "f"}
             print(firstSmall as Any)
         }
         
@@ -200,7 +194,7 @@ class ViewController: UIViewController {
         do {
             let s = "hello"
             let s2 = s.dropFirst()
-            let last = s2.index(of:"o")
+            let last = s2.firstIndex(of:"o")
             print(last as Any) // 4, not 3
         }
         
diff --git a/bk1ch03p104optionals2/bk1ch03p104optionals2/ViewController.swift b/bk1ch03p104optionals2/bk1ch03p104optionals2/ViewController.swift
@@ -102,12 +102,12 @@ class ViewController: UIViewController {
 
 
         let arr = [1,2,3]
-        let ix = (arr as NSArray).index(of:4)
+        let ix = (arr as NSArray).index(of:4) // NSArray method, not Swift
         print(ix)
         if ix == NSNotFound { print("not found") }
         
         let arr2 = [1,2,3]
-        let ix2 = arr2.index(of:4)
+        let ix2 = arr2.firstIndex(of:4)
         if ix2 == nil { print("not found") }
 
 
diff --git a/bk1ch04p136enumInitializers/bk1ch04p136enumInitializers/ViewController.swift b/bk1ch04p136enumInitializers/bk1ch04p136enumInitializers/ViewController.swift
@@ -26,7 +26,7 @@ enum Filter : String, CaseIterable {
         set {}
     }
     mutating func advance() {
-        var ix = Filter.allCases.index(of:self)!
+        var ix = Filter.allCases.firstIndex(of:self)!
         ix = (ix + 1) % Filter.allCases.count
         self = Filter.allCases[ix]
     }
diff --git a/bk1ch04p204arrays/bk1ch04p204collections/ViewController.swift b/bk1ch04p204arrays/bk1ch04p204collections/ViewController.swift
@@ -254,15 +254,13 @@ class ViewController: UIViewController {
             let arr = [1,2,3]
             let ok = arr.contains(2) // ***
             let okk = arr.contains {$0 > 3} // false
-            let ix = arr.index(of:2) // *** Optional wrapping 1
-            let which = arr.index(where:{$0>2})
-            let which2 = arr.first(where:{$0>2})
+            let ix = arr.firstIndex(of:2) // *** Optional wrapping 1
+            let which = arr.firstIndex {$0>2}
+            let which2 = arr.first {$0>2}
             
             let aviary = [Bird(name:"Tweety"), Bird(name:"Flappy"), Bird(name:"Lady")]
-            // let ixxxx = aviary.index(of:Bird(name:"Tweety"))
-            // let ix2 = aviary.index {$0.name.count < 5} // index(where:) works here,
-            // but I think for consistency I'd better say "where" explicitly
-            let ix2 = aviary.index(where: {$0.name.count < 5})
+            // let ixxxx = aviary.firstIndex(of:Bird(name:"Tweety"))
+            let ix2 = aviary.firstIndex {$0.name.count < 5}
             print(ix2 as Any)
             
             do {
diff --git a/bk1ch05p237conditionalEvaluation/bk1ch05p237conditionalEvaluation/ViewController.swift b/bk1ch05p237conditionalEvaluation/bk1ch05p237conditionalEvaluation/ViewController.swift
@@ -119,15 +119,15 @@ class ViewController: UIViewController {
         do {
             let arr = ["Manny", "Moe", "Jack"]
             let target = "Matt"
-            let pos = arr.index(of:target)
+            let pos = arr.firstIndex(of:target)
             let s = pos != nil ? String(pos!) : "NOT FOUND"
             _ = s
         }
 
         do {
             let arr = ["Manny", "Moe", "Jack"]
             let target = "Matt"
-            let s = arr.index(of:target).map {String($0)} ?? "NOT FOUND"
+            let s = arr.firstIndex(of:target).map {String($0)} ?? "NOT FOUND"
             _ = s
         }
 
diff --git a/bk1ch05p247operators/bk1ch05p247operators/ViewController.swift b/bk1ch05p247operators/bk1ch05p247operators/ViewController.swift
@@ -61,7 +61,7 @@ class ViewController: UIViewController {
         print(ok)
         
         let arr = [v1,v2]
-        let ix = arr.index(of:v1) // Optional wrapping 0
+        let ix = arr.firstIndex(of:v1) // Optional wrapping 0
         print(ix as Any)
 
         print(2^^2) // 4
diff --git a/bk1ch05p254memoryManagement/bk1ch05p254memoryManagement/ViewController.swift b/bk1ch05p254memoryManagement/bk1ch05p254memoryManagement/ViewController.swift
@@ -28,7 +28,7 @@ class MyDropBounceAndRollBehavior : UIDynamicBehavior {
         grav.action = {
             [unowned self] in
             let items = anim.items(in: sup.bounds) as! [UIView]
-            if items.index(of: self.v) == nil {
+            if items.firstIndex(of: self.v) == nil {
                 anim.removeBehavior(self)
                 self.v.removeFromSuperview()
             }
diff --git a/bk1ch10p428foundationClasses/bk1ch10p428foundationClasses/ViewController.swift b/bk1ch10p428foundationClasses/bk1ch10p428foundationClasses/ViewController.swift
@@ -42,7 +42,7 @@ class ViewController: UIViewController {
 
         do {
             let arr = ["hey"] as NSArray
-            let ix = arr.index(of:"ho")
+            let ix = arr.index(of:"ho") // NSArray method, not Swift
             if ix == NSNotFound {
                 print("it wasn't found")
             }
@@ -286,7 +286,7 @@ class ViewController: UIViewController {
             if let cdata = ud.object(forKey: "myColor") as? Data {
                 let c = try! NSKeyedUnarchiver.unarchivedObject(ofClass: UIColor.self, from: cdata)
                 // c is an Optional wrapping a UIColor
-                print(c)
+                print(c as Any)
             }
         }
                 
@@ -308,7 +308,7 @@ class ViewController: UIViewController {
             let n3 = 3 as NSNumber
             let ok = n2 == 2 // true
             let ok2 = n2 == 2 as NSNumber // true
-            let ix = [n1,n2,n3].index(of:2) // Optional wrapping 1
+            let ix = [n1,n2,n3].firstIndex(of:2) // Optional wrapping 1
             
             // let ok3 = n1 < n2 // compile error
             let ok4 = n1.compare(n2) == .orderedAscending // true
diff --git a/bk2ch01p045LayoutDrivenTest/LayoutDrivenTest/ViewController.swift b/bk2ch01p045LayoutDrivenTest/LayoutDrivenTest/ViewController.swift
@@ -63,7 +63,7 @@ class GameBoard : UIView {
     var animateTapResponse = true
     @objc func tapped(_ n:Notification) {
         guard let v = n.object as? Card else {return}
-        if let ix = self.hand.index(of:v) {
+        if let ix = self.hand.firstIndex(of:v) {
             self.hand.remove(at:ix)
         } else {
             self.hand.append(v)
diff --git a/bk2ch04p175dynamics/Dynamics/ViewController.swift b/bk2ch04p175dynamics/Dynamics/ViewController.swift
@@ -93,7 +93,7 @@ class ViewController : UIViewController {
                 // let items = self.anim.items(in: self.view.bounds) as! [UIView]
                 // crash because it contains, wrongly, a collision behavior object
                 let items = self.anim.views(in: self.view.bounds)
-                let ix = items.index(of:self.iv)
+                let ix = items.firstIndex(of:self.iv)
                 if ix == nil {
                     self.anim.removeAllBehaviors()
                     self.iv.removeFromSuperview()
@@ -103,7 +103,7 @@ class ViewController : UIViewController {
         case 2:
             grav.action = {
                 let items = self.anim.views(in:self.view.bounds)
-                let ix = items.index(of:self.iv)
+                let ix = items.firstIndex(of:self.iv)
                 if ix == nil {
                     self.anim.removeAllBehaviors()
                     self.iv.removeFromSuperview()
@@ -114,7 +114,7 @@ class ViewController : UIViewController {
         case 3:
             grav.action = {
                 let items = self.anim.views(in:self.view.bounds)
-                let ix = items.index(of:self.iv)
+                let ix = items.firstIndex(of:self.iv)
                 if ix == nil {
                     delay(0) { // * both are released
                         self.anim.removeAllBehaviors()
@@ -128,7 +128,7 @@ class ViewController : UIViewController {
                 [weak grav] in // *
                 if let grav = grav {
                     let items = self.anim.views(in:self.view.bounds)
-                    let ix = items.index(of:self.iv)
+                    let ix = items.firstIndex(of:self.iv)
                     if ix == nil {
                         self.anim.removeBehavior(grav) // * grav is released, iv is not!
                         self.anim.removeAllBehaviors() // probably because of the other behaviors
diff --git a/bk2ch04p177dynamics2/Dynamics/MyDropBounceAndRollBehavior.swift b/bk2ch04p177dynamics2/Dynamics/MyDropBounceAndRollBehavior.swift
@@ -58,7 +58,7 @@ class MyDropBounceAndRollBehavior : UIDynamicBehavior, UICollisionBehaviorDelega
             // let items = anim.items(in: sup.bounds) as! [UIView]
             // crash because it contains, wrongly, a collision behavior object
             let items = anim.views(in: sup.bounds)
-            if items.index(of:self.v) == nil {
+            if items.firstIndex(of:self.v) == nil {
                 anim.removeBehavior(self)
                 self.v.removeFromSuperview()
                 print("done")
diff --git a/bk2ch06p292customAnimation1/ch19p620customAnimation1/AppDelegate.swift b/bk2ch06p292customAnimation1/ch19p620customAnimation1/AppDelegate.swift
@@ -60,8 +60,8 @@ extension AppDelegate : UIViewControllerAnimatedTransitioning {
         // which way we are going depends on which vc is which
         // the most general way to express this is in terms of index number
         let tbc = self.window!.rootViewController as! UITabBarController
-        let ix1 = tbc.viewControllers!.index(of:vc1)!
-        let ix2 = tbc.viewControllers!.index(of:vc2)!
+        let ix1 = tbc.viewControllers!.firstIndex(of:vc1)!
+        let ix2 = tbc.viewControllers!.firstIndex(of:vc2)!
         let dir : CGFloat = ix1 < ix2 ? 1 : -1
         var r1end = r1start
         r1end.origin.x -= r1end.size.width * dir
diff --git a/bk2ch06p300customAnimation3/ch19p620customAnimation1/AppDelegate.swift b/bk2ch06p300customAnimation3/ch19p620customAnimation1/AppDelegate.swift
@@ -147,8 +147,8 @@ extension AppDelegate : UIViewControllerAnimatedTransitioning {
         // which way we are going depends on which vc is which
         // the most general way to express this is in terms of index number
         let tbc = self.window!.rootViewController as! UITabBarController
-        let ix1 = tbc.viewControllers!.index(of:vc1)!
-        let ix2 = tbc.viewControllers!.index(of:vc2)!
+        let ix1 = tbc.viewControllers!.firstIndex(of:vc1)!
+        let ix2 = tbc.viewControllers!.firstIndex(of:vc2)!
         let dir : CGFloat = ix1 < ix2 ? 1 : -1
         var r1end = r1start
         r1end.origin.x -= r1end.size.width * dir
diff --git a/bk2ch06p300customAnimation3b/ch19p620customAnimation1/AppDelegate.swift b/bk2ch06p300customAnimation3b/ch19p620customAnimation1/AppDelegate.swift
@@ -137,8 +137,8 @@ extension AppDelegate : UIViewControllerAnimatedTransitioning {
         // which way we are going depends on which vc is which
         // the most general way to express this is in terms of index number
         let tbc = self.window!.rootViewController as! UITabBarController
-        let ix1 = tbc.viewControllers!.index(of:vc1)!
-        let ix2 = tbc.viewControllers!.index(of:vc2)!
+        let ix1 = tbc.viewControllers!.firstIndex(of:vc1)!
+        let ix2 = tbc.viewControllers!.firstIndex(of:vc2)!
         let dir : CGFloat = ix1 < ix2 ? 1 : -1
         var r1end = r1start
         r1end.origin.x -= r1end.size.width * dir
diff --git a/bk2ch06p311pageController/ch19p626pageController/AppDelegate.swift b/bk2ch06p311pageController/ch19p626pageController/AppDelegate.swift
@@ -40,15 +40,15 @@ class AppDelegate : UIResponder, UIApplicationDelegate {
 extension AppDelegate : UIPageViewControllerDataSource {
     func pageViewController(_ pvc: UIPageViewController, viewControllerAfter vc: UIViewController) -> UIViewController? {
         let boy = (vc as! Pep).boy
-        let ix = self.pep.index(of:boy)! + 1
+        let ix = self.pep.firstIndex(of:boy)! + 1
         if ix >= self.pep.count {
             return nil
         }
         return Pep(pepBoy: self.pep[ix])
     }
     func pageViewController(_ pvc: UIPageViewController, viewControllerBefore vc: UIViewController) -> UIViewController? {
         let boy = (vc as! Pep).boy
-        let ix = self.pep.index(of:boy)! - 1
+        let ix = self.pep.firstIndex(of:boy)! - 1
         if ix < 0 {
             return nil
         }
@@ -63,7 +63,7 @@ extension AppDelegate : UIPageViewControllerDataSource {
     func presentationIndex(for pvc: UIPageViewController) -> Int {
         let page = pvc.viewControllers![0] as! Pep
         let boy = page.boy
-        return self.pep.index(of:boy)!
+        return self.pep.firstIndex(of:boy)!
     }
     
     // =======
diff --git a/bk2ch06p317pageControllerChild/ch19p626pageController/RootViewController.swift b/bk2ch06p317pageControllerChild/ch19p626pageController/RootViewController.swift
@@ -39,15 +39,15 @@ class RootViewController: UIViewController, UIPageViewControllerDataSource {
 
     func pageViewController(_ pvc: UIPageViewController, viewControllerAfter vc: UIViewController) -> UIViewController? {
         let boy = (vc as! Pep).boy
-        let ix = self.pep.index(of:boy)! + 1
+        let ix = self.pep.firstIndex(of:boy)! + 1
         if ix >= self.pep.count {
             return nil
         }
         return Pep(pepBoy: self.pep[ix])
     }
     func pageViewController(_ pvc: UIPageViewController, viewControllerBefore vc: UIViewController) -> UIViewController? {
         let boy = (vc as! Pep).boy
-        let ix = self.pep.index(of:boy)! - 1
+        let ix = self.pep.firstIndex(of:boy)! - 1
         if ix < 0 {
             return nil
         }
@@ -62,7 +62,7 @@ class RootViewController: UIViewController, UIPageViewControllerDataSource {
     func presentationIndex(for pvc: UIPageViewController) -> Int {
         let page = pvc.viewControllers![0] as! Pep
         let boy = page.boy
-        return self.pep.index(of:boy)!
+        return self.pep.firstIndex(of:boy)!
     }
 
 
diff --git a/bk2ch06p351pageControllerRestoration/ch19p626pageController/AppDelegate.swift b/bk2ch06p351pageControllerRestoration/ch19p626pageController/AppDelegate.swift
@@ -62,15 +62,15 @@ class AppDelegate : UIResponder, UIApplicationDelegate {
 extension AppDelegate : UIPageViewControllerDataSource {
     func pageViewController(_ pvc: UIPageViewController, viewControllerAfter vc: UIViewController) -> UIViewController? {
         let boy = (vc as! Pep).boy
-        let ix = self.pep.index(of:boy)! + 1
+        let ix = self.pep.firstIndex(of:boy)! + 1
         if ix >= self.pep.count {
             return nil
         }
         return Pep(pepBoy: self.pep[ix])
     }
     func pageViewController(_ pvc: UIPageViewController, viewControllerBefore vc: UIViewController) -> UIViewController? {
         let boy = (vc as! Pep).boy
-        let ix = self.pep.index(of:boy)! - 1
+        let ix = self.pep.firstIndex(of:boy)! - 1
         if ix < 0 {
             return nil
         }
@@ -85,7 +85,7 @@ extension AppDelegate : UIPageViewControllerDataSource {
     func presentationIndex(for pvc: UIPageViewController) -> Int {
         let page = pvc.viewControllers![0] as! Pep
         let boy = page.boy
-        return self.pep.index(of:boy)!
+        return self.pep.firstIndex(of:boy)!
     }
     
 }
diff --git a/bk2ch06p352pageControllerRestoration2/ch19p626pageController/AppDelegate.swift b/bk2ch06p352pageControllerRestoration2/ch19p626pageController/AppDelegate.swift
@@ -68,15 +68,15 @@ class AppDelegate : UIResponder, UIApplicationDelegate {
 extension AppDelegate : UIPageViewControllerDataSource {
     func pageViewController(_ pvc: UIPageViewController, viewControllerAfter vc: UIViewController) -> UIViewController? {
         let boy = (vc as! Pep).boy
-        let ix = self.pep.index(of:boy)! + 1
+        let ix = self.pep.firstIndex(of:boy)! + 1
         if ix >= self.pep.count {
             return nil
         }
         return Pep(pepBoy: self.pep[ix])
     }
     func pageViewController(_ pvc: UIPageViewController, viewControllerBefore vc: UIViewController) -> UIViewController? {
         let boy = (vc as! Pep).boy
-        let ix = self.pep.index(of:boy)! - 1
+        let ix = self.pep.firstIndex(of:boy)! - 1
         if ix < 0 {
             return nil
         }
@@ -91,7 +91,7 @@ extension AppDelegate : UIPageViewControllerDataSource {
     func presentationIndex(for pvc: UIPageViewController) -> Int {
         let page = pvc.viewControllers![0] as! Pep
         let boy = page.boy
-        return self.pep.index(of:boy)!
+        return self.pep.firstIndex(of:boy)!
     }
     
 }
diff --git a/bk2ch06p353pageControllerRestoration3/ch19p626pageController/AppDelegate.swift b/bk2ch06p353pageControllerRestoration3/ch19p626pageController/AppDelegate.swift
@@ -80,15 +80,15 @@ class AppDelegate : UIResponder, UIApplicationDelegate {
 extension AppDelegate : UIPageViewControllerDataSource {
     func pageViewController(_ pvc: UIPageViewController, viewControllerAfter vc: UIViewController) -> UIViewController? {
         let boy = (vc as! Pep).boy
-        let ix = self.pep.index(of:boy)! + 1
+        let ix = self.pep.firstIndex(of:boy)! + 1
         if ix >= self.pep.count {
             return nil
         }
         return Pep(pepBoy: self.pep[ix])
     }
     func pageViewController(_ pvc: UIPageViewController, viewControllerBefore vc: UIViewController) -> UIViewController? {
         let boy = (vc as! Pep).boy
-        let ix = self.pep.index(of:boy)! - 1
+        let ix = self.pep.firstIndex(of:boy)! - 1
         if ix < 0 {
             return nil
         }
@@ -103,7 +103,7 @@ extension AppDelegate : UIPageViewControllerDataSource {
     func presentationIndex(for pvc: UIPageViewController) -> Int {
         let page = pvc.viewControllers![0] as! Pep
         let boy = page.boy
-        return self.pep.index(of:boy)!
+        return self.pep.firstIndex(of:boy)!
     }
     
 }
diff --git a/bk2ch10p524keyboardAccessory/ch21p808keyboardAccessory/ViewController.swift b/bk2ch10p524keyboardAccessory/ch21p808keyboardAccessory/ViewController.swift
diff --git a/bk2ch24p853bonjour/ch37p1101bonjour/ViewController.swift b/bk2ch24p853bonjour/ch37p1101bonjour/ViewController.swift

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ enum Filter : String, CaseIterable {`
`26`	`26`	`set {}`
`27`	`27`	`}`
`28`	`28`	`mutating func advance() {`
`29`		`- var ix = Filter.allCases.index(of:self)!`
	`29`	`+ var ix = Filter.allCases.firstIndex(of:self)!`
`30`	`30`	`ix = (ix + 1) % Filter.allCases.count`
`31`	`31`	`self = Filter.allCases[ix]`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class MyDropBounceAndRollBehavior : UIDynamicBehavior {`
`28`	`28`	`grav.action = {`
`29`	`29`	`[unowned self] in`
`30`	`30`	`let items = anim.items(in: sup.bounds) as! [UIView]`
`31`		`- if items.index(of: self.v) == nil {`
	`31`	`+ if items.firstIndex(of: self.v) == nil {`
`32`	`32`	`anim.removeBehavior(self)`
`33`	`33`	`self.v.removeFromSuperview()`
`34`	`34`	`}`