Updated for Swift 3.0

colemancda · colemancda · commit d06e4ac56a97 · 2016-07-21T00:34:53.000-05:00
Swift 3.0 Development 2016-07-16
diff --git a/Sources/SwiftFoundation/Base64.swift b/Sources/SwiftFoundation/Base64.swift
@@ -232,7 +232,7 @@
             let appendByteToResult : (UInt8) -> () = {
                 result.append($0)
                 currentLineCount += 1
-                if let options = lineOptions where currentLineCount == options.lineLength {
+                if let options = lineOptions, currentLineCount == options.lineLength {
                     result.append(contentsOf: options.separator)
                     currentLineCount = 0
                 }
diff --git a/Sources/SwiftFoundation/Data.swift b/Sources/SwiftFoundation/Data.swift
@@ -85,7 +85,7 @@
             guard let pointer = buffer.baseAddress
                 else { self.init(); return }
             
-            self.init(bytes: pointer, count: sizeof(SourceType) * buffer.count)
+            self.init(bytes: pointer, count: sizeof(SourceType.self) * buffer.count)
         }
         
         // MARK: - Accessors
diff --git a/Sources/SwiftFoundation/JSONExtensions.swift b/Sources/SwiftFoundation/JSONExtensions.swift
@@ -100,7 +100,7 @@ public extension Collection where Iterator.Element: JSONEncodable {
     }
 }
 
-public extension Dictionary where Value: JSONEncodable, Key: StringLiteralConvertible {
+public extension Dictionary where Value: JSONEncodable, Key: ExpressibleByStringLiteral {
     
     /// Encodes the reciever into JSON.
     func toJSON() -> JSON.Value {
diff --git a/Sources/SwiftFoundation/JSONSerialization.swift b/Sources/SwiftFoundation/JSONSerialization.swift
@@ -103,22 +103,22 @@ public extension JSON {
     public enum WritingOption: BitMaskOption {
         
         /// Causes the output to have minimal whitespace inserted to make things slightly more readable.
-        case Spaced
+        case spaced
         
         /// Causes the output to be formatted. See the [Two Space Tab](http://jsonformatter.curiousconcept.com/) option
         /// for an example of the format.
-        case Pretty
+        case pretty
         
         /// Drop trailing zero for float values
-        case NoZero
+        case noZero
         
         public init?(rawValue: Int32) {
             
             switch rawValue {
                 
-            case JSON_C_TO_STRING_SPACED:       self = .Spaced
-            case JSON_C_TO_STRING_PRETTY:       self = .Pretty
-            case JSON_C_TO_STRING_NOZERO:       self = .NoZero
+            case JSON_C_TO_STRING_SPACED:       self = .spaced
+            case JSON_C_TO_STRING_PRETTY:       self = .pretty
+            case JSON_C_TO_STRING_NOZERO:       self = .noZero
                 
             default: return nil
             }
@@ -128,9 +128,9 @@ public extension JSON {
             
             switch self {
                 
-            case Spaced:        return JSON_C_TO_STRING_SPACED
-            case Pretty:        return JSON_C_TO_STRING_PRETTY
-            case NoZero:        return JSON_C_TO_STRING_NOZERO
+            case .spaced:        return JSON_C_TO_STRING_SPACED
+            case .pretty:        return JSON_C_TO_STRING_PRETTY
+            case .noZero:        return JSON_C_TO_STRING_NOZERO
             }
         }
     }
diff --git a/Sources/SwiftFoundation/POSIXError.swift b/Sources/SwiftFoundation/POSIXError.swift
@@ -13,10 +13,6 @@
     import Glibc
 #endif
 
-#if os(OSX) || os(iOS) || os(watchOS) || os(tvOS)
-    
-#endif
-
 public extension POSIXError {
     
     /// Creates error from C ```errno```.
@@ -28,14 +24,18 @@ public extension POSIXError {
         return self.init(code: code)
     }
     
+#if os(OSX) || os(iOS) || os(watchOS) || os(tvOS)
+    
     /// Creates `POSIXError` from error code.
-    @inline(__always)
     init(code: POSIXErrorCode) {
         
         let nsError = NSError(domain: NSPOSIXErrorDomain, code: Int(code.rawValue), userInfo: nil)
         
         self.init(_nsError: nsError)
     }
+    
+#endif
+
 }
 
 #if os(Linux)
diff --git a/Sources/SwiftFoundation/RegularExpressionCompileError.swift b/Sources/SwiftFoundation/RegularExpressionCompileError.swift
@@ -15,7 +15,7 @@
 public extension RegularExpression {
     
     // POSIX Regular Expression compilation error
-    public enum CompileError: RawRepresentable, ErrorProtocol {
+    public enum CompileError: Error, RawRepresentable {
         
         /// Invalid use  of repetition operators such as using '*' as the first character.
         ///
@@ -71,18 +71,18 @@ public extension RegularExpression {
             
             switch rawValue {
                 
-            case REG_BADRPT:                            self = InvalidRepetition
-            case REG_BADBR:                             self = InvalidBackReference
-            case REG_ESPACE:                            self = OutOfMemory
-            case REG_BADPAT:                            self = InvalidPatternOperator
-            case REG_EBRACE:                            self = UnMatchedBraceInterval
-            case REG_EBRACK:                            self = UnMatchedBracketList
-            case REG_ECOLLATE:                          self = InvalidCollating
-            case REG_ECTYPE:                            self = UnknownCharacterClassName
-            case REG_EESCAPE:                           self = TrailingBackslash
-            case REG_EPAREN:                            self = UnMatchedParenthesis
-            case REG_ERANGE:                            self = InvalidRange
-            case REG_ESUBREG:                           self = InvalidBackReferenceToSubExpression
+            case REG_BADRPT:                            self = .InvalidRepetition
+            case REG_BADBR:                             self = .InvalidBackReference
+            case REG_ESPACE:                            self = .OutOfMemory
+            case REG_BADPAT:                            self = .InvalidPatternOperator
+            case REG_EBRACE:                            self = .UnMatchedBraceInterval
+            case REG_EBRACK:                            self = .UnMatchedBracketList
+            case REG_ECOLLATE:                          self = .InvalidCollating
+            case REG_ECTYPE:                            self = .UnknownCharacterClassName
+            case REG_EESCAPE:                           self = .TrailingBackslash
+            case REG_EPAREN:                            self = .UnMatchedParenthesis
+            case REG_ERANGE:                            self = .InvalidRange
+            case REG_ESUBREG:                           self = .InvalidBackReferenceToSubExpression
                 
                 /*
                 #if os(linux)
@@ -101,18 +101,18 @@ public extension RegularExpression {
             
             switch self {
                 
-            case InvalidRepetition:                     return REG_BADRPT
-            case InvalidBackReference:                  return REG_BADBR
-            case OutOfMemory:                           return REG_ESPACE
-            case InvalidPatternOperator:                return REG_BADPAT
-            case UnMatchedBraceInterval:                return REG_EBRACE
-            case UnMatchedBracketList:                  return REG_EBRACK
-            case InvalidCollating:                      return REG_ECOLLATE
-            case UnknownCharacterClassName:             return REG_ECTYPE
-            case TrailingBackslash:                     return REG_EESCAPE
-            case UnMatchedParenthesis:                  return REG_EPAREN
-            case InvalidRange:                          return REG_ERANGE
-            case InvalidBackReferenceToSubExpression:   return REG_ESUBREG
+            case .InvalidRepetition:                     return REG_BADRPT
+            case .InvalidBackReference:                  return REG_BADBR
+            case .OutOfMemory:                           return REG_ESPACE
+            case .InvalidPatternOperator:                return REG_BADPAT
+            case .UnMatchedBraceInterval:                return REG_EBRACE
+            case .UnMatchedBracketList:                  return REG_EBRACK
+            case .InvalidCollating:                      return REG_ECOLLATE
+            case .UnknownCharacterClassName:             return REG_ECTYPE
+            case .TrailingBackslash:                     return REG_EESCAPE
+            case .UnMatchedParenthesis:                  return REG_EPAREN
+            case .InvalidRange:                          return REG_ERANGE
+            case .InvalidBackReferenceToSubExpression:   return REG_ESUBREG
             }
         }
     }
diff --git a/Sources/SwiftFoundation/RegularExpressionCompileOption.swift b/Sources/SwiftFoundation/RegularExpressionCompileOption.swift
@@ -36,10 +36,10 @@ public extension RegularExpression {
             
             switch rawValue {
                 
-            case REG_ICASE:             self = CaseInsensitive
-            case REG_EXTENDED:          self = ExtendedSyntax
-            case REG_NOSUB:             self = NoSub
-            case REG_NEWLINE:           self = NewLine
+            case REG_ICASE:             self = .CaseInsensitive
+            case REG_EXTENDED:          self = .ExtendedSyntax
+            case REG_NOSUB:             self = .NoSub
+            case REG_NEWLINE:           self = .NewLine
                 
             default: return nil
             }
diff --git a/Sources/SwiftFoundation/RegularExpressionMatchOption.swift b/Sources/SwiftFoundation/RegularExpressionMatchOption.swift
@@ -29,8 +29,8 @@ public extension RegularExpression {
             
             switch rawValue {
                 
-            case REG_NOTBOL:            self = NotBeginningOfLine
-            case REG_NOTEOL:            self = NotEndOfLine
+            case REG_NOTBOL:            self = .NotBeginningOfLine
+            case REG_NOTEOL:            self = .NotEndOfLine
                 
             default: return nil
             }
@@ -45,4 +45,4 @@ public extension RegularExpression {
             }
         }
     }
-}
+}
diff --git a/Sources/SwiftFoundation/Thread.swift b/Sources/SwiftFoundation/Thread.swift
@@ -66,15 +66,15 @@ public final class Thread {
         let errorCode = pthread_join(internalThread, nil)
         
         guard errorCode == 0
-            else { throw POSIXError(rawValue: errorCode)! }
+            else { throw POSIXError(code: POSIXErrorCode(rawValue: errorCode)!) }
     }
     
     public func cancel() throws {
         
         let errorCode = pthread_cancel(internalThread)
         
         guard errorCode == 0
-            else { throw POSIXError(rawValue: errorCode)! }
+            else { throw POSIXError(code: POSIXErrorCode(rawValue: errorCode)!) }
     }
 }
 
diff --git a/Xcode/SwiftFoundation.xcodeproj/project.pbxproj b/Xcode/SwiftFoundation.xcodeproj/project.pbxproj
@@ -1011,6 +1011,7 @@
 				PRODUCT_NAME = SwiftFoundation;
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;
@@ -1056,6 +1057,7 @@
 				PRODUCT_NAME = SwiftFoundation;
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;

Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@`
`232`	`232`	`let appendByteToResult : (UInt8) -> () = {`
`233`	`233`	`result.append($0)`
`234`	`234`	`currentLineCount += 1`
`235`		`- if let options = lineOptions where currentLineCount == options.lineLength {`
	`235`	`+ if let options = lineOptions, currentLineCount == options.lineLength {`
`236`	`236`	`result.append(contentsOf: options.separator)`
`237`	`237`	`currentLineCount = 0`
`238`	`238`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@`
`85`	`85`	`guard let pointer = buffer.baseAddress`
`86`	`86`	`else { self.init(); return }`
`87`	`87`
`88`		`- self.init(bytes: pointer, count: sizeof(SourceType) * buffer.count)`
	`88`	`+ self.init(bytes: pointer, count: sizeof(SourceType.self) * buffer.count)`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`// MARK: - Accessors`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public extension Collection where Iterator.Element: JSONEncodable {`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`
`103`		`-public extension Dictionary where Value: JSONEncodable, Key: StringLiteralConvertible {`
	`103`	`+public extension Dictionary where Value: JSONEncodable, Key: ExpressibleByStringLiteral {`
`104`	`104`
`105`	`105`	`/// Encodes the reciever into JSON.`
`106`	`106`	`func toJSON() -> JSON.Value {`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ public extension RegularExpression {`
`29`	`29`
`30`	`30`	`switch rawValue {`
`31`	`31`
`32`		`- case REG_NOTBOL: self = NotBeginningOfLine`
`33`		`- case REG_NOTEOL: self = NotEndOfLine`
	`32`	`+ case REG_NOTBOL: self = .NotBeginningOfLine`
	`33`	`+ case REG_NOTEOL: self = .NotEndOfLine`
`34`	`34`
`35`	`35`	`default: return nil`
`36`	`36`	`}`
`@@ -45,4 +45,4 @@ public extension RegularExpression {`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`	`}`
`48`		`-}`
	`48`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -66,15 +66,15 @@ public final class Thread {`
`66`	`66`	`let errorCode = pthread_join(internalThread, nil)`
`67`	`67`
`68`	`68`	`guard errorCode == 0`
`69`		`- else { throw POSIXError(rawValue: errorCode)! }`
	`69`	`+ else { throw POSIXError(code: POSIXErrorCode(rawValue: errorCode)!) }`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`public func cancel() throws {`
`73`	`73`
`74`	`74`	`let errorCode = pthread_cancel(internalThread)`
`75`	`75`
`76`	`76`	`guard errorCode == 0`
`77`		`- else { throw POSIXError(rawValue: errorCode)! }`
	`77`	`+ else { throw POSIXError(code: POSIXErrorCode(rawValue: errorCode)!) }`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`