minor tweaks up thru chapter 5

mattneub · mattneub · commit 1de777b650b4 · 2016-07-09T20:07:58.000-07:00
diff --git a/bk1ch05p230switch/bk1ch05p230switch/ViewController.swift b/bk1ch05p230switch/bk1ch05p230switch/ViewController.swift
@@ -213,7 +213,7 @@ class ViewController: UIViewController, UIBarPositioningDelegate {
         }
 
         switch err {
-        case .number(1..<Int.max):
+        case .number(1...Int.max):
             print("It's a positive error number")
         case .number(Int.min...(-1)):
             print("It's a negative error number")
diff --git a/bk1ch05p239loops/bk1ch05p239loops/ViewController.swift b/bk1ch05p239loops/bk1ch05p239loops/ViewController.swift
@@ -176,11 +176,13 @@ class ViewController: UIViewController {
         
         do {
             let seq = sequence(first:1) {$0 >= 10 ? nil : $0 + 1}
-            print(Array(seq))
             for i in seq {
-                print(i)
+                print(i) // 1,2,3,4,5,6,7,8,9,10
+            }
+            let seq2 = sequence(first:1) {$0 + 1}
+            for i in seq2.prefix(5) {
+                print(i) // 1,2,3,4,5
             }
-            print(Array(seq.prefix(5)))
         }
         
         do {
@@ -198,7 +200,9 @@ class ViewController: UIViewController {
                 pair = (pair.1,n)
                 return n
             }
-            print(Array(fib.prefix(10)))
+            for i in fib.prefix(10) {
+                print(i)
+            }
             // i.e. the first 10 elements of the fibonacci sequence
         }
         
diff --git a/bk1ch05p240error/bk1ch05p241error.xcodeproj/project.pbxproj b/bk1ch05p240error/bk1ch05p241error.xcodeproj/project.pbxproj
@@ -13,6 +13,7 @@
 		32F8A8B81B385DBA0042B53B /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 32F8A8B61B385DBA0042B53B /* Main.storyboard */; };
 		32F8A8BA1B385DBA0042B53B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 32F8A8B91B385DBA0042B53B /* Assets.xcassets */; };
 		32F8A8BD1B385DBA0042B53B /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 32F8A8BB1B385DBA0042B53B /* LaunchScreen.storyboard */; };
+		81668A631D315F1300EC7B6E /* Thing.m in Sources */ = {isa = PBXBuildFile; fileRef = 81668A621D315F1300EC7B6E /* Thing.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -24,6 +25,9 @@
 		32F8A8B91B385DBA0042B53B /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		32F8A8BC1B385DBA0042B53B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		32F8A8BE1B385DBA0042B53B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		81668A601D315F1300EC7B6E /* bk1ch05p241error-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "bk1ch05p241error-Bridging-Header.h"; sourceTree = "<group>"; };
+		81668A611D315F1300EC7B6E /* Thing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Thing.h; sourceTree = "<group>"; };
+		81668A621D315F1300EC7B6E /* Thing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Thing.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -58,11 +62,14 @@
 			children = (
 				32F8A8B21B385DBA0042B53B /* AppDelegate.swift */,
 				32F8A8B41B385DBA0042B53B /* ViewController.swift */,
+				81668A611D315F1300EC7B6E /* Thing.h */,
+				81668A621D315F1300EC7B6E /* Thing.m */,
 				3269B3121B8D39B3009950F2 /* testing.txt */,
 				32F8A8B61B385DBA0042B53B /* Main.storyboard */,
 				32F8A8B91B385DBA0042B53B /* Assets.xcassets */,
 				32F8A8BB1B385DBA0042B53B /* LaunchScreen.storyboard */,
 				32F8A8BE1B385DBA0042B53B /* Info.plist */,
+				81668A601D315F1300EC7B6E /* bk1ch05p241error-Bridging-Header.h */,
 			);
 			path = bk1ch05p241error;
 			sourceTree = "<group>";
@@ -139,6 +146,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				81668A631D315F1300EC7B6E /* Thing.m in Sources */,
 				32F8A8B51B385DBA0042B53B /* ViewController.swift in Sources */,
 				32F8A8B31B385DBA0042B53B /* AppDelegate.swift in Sources */,
 			);
@@ -251,10 +259,13 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ENABLE_MODULES = YES;
 				INFOPLIST_FILE = bk1ch05p241error/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.neuburg.matt.bk1ch05p241error;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OBJC_BRIDGING_HEADER = "bk1ch05p241error/bk1ch05p241error-Bridging-Header.h";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
@@ -263,10 +274,12 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ENABLE_MODULES = YES;
 				INFOPLIST_FILE = bk1ch05p241error/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.neuburg.matt.bk1ch05p241error;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OBJC_BRIDGING_HEADER = "bk1ch05p241error/bk1ch05p241error-Bridging-Header.h";
 				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
diff --git a/bk1ch05p240error/bk1ch05p241error/Thing.h b/bk1ch05p240error/bk1ch05p241error/Thing.h
@@ -0,0 +1,7 @@
+
+
+#import <Foundation/Foundation.h>
+
+@interface Thing : NSObject
+
+@end
diff --git a/bk1ch05p240error/bk1ch05p241error/Thing.m b/bk1ch05p240error/bk1ch05p241error/Thing.m
@@ -0,0 +1,24 @@
+
+
+#import "Thing.h"
+
+@implementation Thing
+
+- (void) dummy {
+    
+    NSString* f = @"";
+    
+    NSError* err;
+    NSString* s =
+        [[NSString alloc] initWithContentsOfFile:f
+                                        encoding:NSUTF8StringEncoding
+                                           error:&err];
+    if (s == nil) {
+        NSLog(@"%@", err);
+    }
+    
+    
+    
+}
+
+@end
diff --git a/bk1ch05p240error/bk1ch05p241error/ViewController.swift b/bk1ch05p240error/bk1ch05p241error/ViewController.swift
@@ -16,10 +16,17 @@ enum MySecondError : ErrorProtocol {
 struct SomeStruct : ErrorProtocol {
     
 }
-struct SomeClass : ErrorProtocol {
+class SomeClass : ErrorProtocol {
     
 }
 
+class MyClassyError : ErrorProtocol {
+    init() {
+        // self._code = 666 // nope, it's immutable
+    }
+}
+
+
 struct SomeStruct2 : ErrorProtocol {
     let name : String
     static var someError: SomeStruct2 { return SomeStruct2(name:"howdy") }
@@ -94,7 +101,7 @@ class ViewController: UIViewController {
         print(err3._domain)
         print(err3._code)
         print(err3 as NSError)
-
+        
         
     }
     
diff --git a/bk1ch05p240error/bk1ch05p241error/bk1ch05p241error-Bridging-Header.h b/bk1ch05p240error/bk1ch05p241error/bk1ch05p241error-Bridging-Header.h
@@ -0,0 +1,4 @@
+//
+//  Use this file to import your target's public headers that you would like to expose to Swift.
+//
+
diff --git a/bk1ch05p254memoryManagement/bk1ch05p254memoryManagement/ViewController.swift b/bk1ch05p254memoryManagement/bk1ch05p254memoryManagement/ViewController.swift
@@ -21,8 +21,8 @@ class MyDropBounceAndRollBehavior : UIDynamicBehavior {
         self.v = v
         super.init()
     }
-    override func willMove(to anim: UIDynamicAnimator!) {
-        if anim == nil { return }
+    override func willMove(to anim: UIDynamicAnimator?) {
+        guard let anim = anim else { return }
         let sup = self.v.superview!
         let grav = UIGravityBehavior()
         grav.action = {
@@ -45,7 +45,7 @@ class SecondViewController : UIViewController {
     // ...
 }
 protocol SecondViewControllerDelegate : class {
-    func acceptData(data:AnyObject!)
+    func accept(data:AnyObject!)
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ class ViewController: UIViewController, UIBarPositioningDelegate {`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`switch err {`
`216`		`- case .number(1..<Int.max):`
	`216`	`+ case .number(1...Int.max):`
`217`	`217`	`print("It's a positive error number")`
`218`	`218`	`case .number(Int.min...(-1)):`
`219`	`219`	`print("It's a negative error number")`
Original file line number	Diff line number	Diff line change
`@@ -176,11 +176,13 @@ class ViewController: UIViewController {`
`176`	`176`
`177`	`177`	`do {`
`178`	`178`	`let seq = sequence(first:1) {$0 >= 10 ? nil : $0 + 1}`
`179`		`- print(Array(seq))`
`180`	`179`	`for i in seq {`
`181`		`- print(i)`
	`180`	`+ print(i) // 1,2,3,4,5,6,7,8,9,10`
	`181`	`+ }`
	`182`	`+ let seq2 = sequence(first:1) {$0 + 1}`
	`183`	`+ for i in seq2.prefix(5) {`
	`184`	`+ print(i) // 1,2,3,4,5`
`182`	`185`	`}`
`183`		`- print(Array(seq.prefix(5)))`
`184`	`186`	`}`
`185`	`187`
`186`	`188`	`do {`
`@@ -198,7 +200,9 @@ class ViewController: UIViewController {`
`198`	`200`	`pair = (pair.1,n)`
`199`	`201`	`return n`
`200`	`202`	`}`
`201`		`- print(Array(fib.prefix(10)))`
	`203`	`+ for i in fib.prefix(10) {`
	`204`	`+ print(i)`
	`205`	`+ }`
`202`	`206`	`// i.e. the first 10 elements of the fibonacci sequence`
`203`	`207`	`}`
`204`	`208`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
++
++
 +#import <Foundation/Foundation.h>
++
 +@interface Thing : NSObject
++
 +@end
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ class MyDropBounceAndRollBehavior : UIDynamicBehavior {`
`21`	`21`	`self.v = v`
`22`	`22`	`super.init()`
`23`	`23`	`}`
`24`		`- override func willMove(to anim: UIDynamicAnimator!) {`
`25`		`- if anim == nil { return }`
	`24`	`+ override func willMove(to anim: UIDynamicAnimator?) {`
	`25`	`+ guard let anim = anim else { return }`
`26`	`26`	`let sup = self.v.superview!`
`27`	`27`	`let grav = UIGravityBehavior()`
`28`	`28`	`grav.action = {`
`@@ -45,7 +45,7 @@ class SecondViewController : UIViewController {`
`45`	`45`	`// ...`
`46`	`46`	`}`
`47`	`47`	`protocol SecondViewControllerDelegate : class {`
`48`		`- func acceptData(data:AnyObject!)`
	`48`	`+ func accept(data:AnyObject!)`
`49`	`49`	`}`
`50`	`50`
`51`	`51`