Merge branch 'master' into feature/NSJSONSerialization-deserialization

Author: argon

CONTRIBUTING.md

@@ -1,6 +1,11 @@
 # Contributing
 
-Contributions to Foundation are welcome! This project follows the [contribution guidelines for the Swift project](https://swift.org/contributing/#reporting-bugs). A few additional details are outlined below.
+Contributions to Foundation are welcome! This project follows the [contribution guidelines for the Swift project](https://swift.org/contributing/#contributing-code). A few additional details are outlined below.
+
+## Licensing
+
+By submitting a pull request, you represent that you have the right to license your contribution to Apple and the community, and agree by submitting the patch that your contributions are licensed under the [Swift license](https://swift.org/LICENSE.txt).
+
 
 ## Bug Reports
 

Docs/Design.md

@@ -13,6 +13,8 @@ In a very limited number of cases, key Foundation API as it exists on Apple plat
 
 A significant portion of the implementation of Foundation on Apple platforms is provided by another framework called CoreFoundation (a.k.a. CF). CF is written primarily in C and is very portable. Therefore we have chosen to use it for the internal implementation of Swift Foundation where possible. As CF is present on all platforms, we can use it to provide a common implementation everywhere.
 
+Another aspect of portability is keeping dependencies to an absolute minimum. With fewer dependencies to port, it is more likely that Foundation will be able to easily compile and run on new platforms. Therefore, we will prefer solutions that are implemented in Foundation itself. Exceptions can be made for major functionality (for example, `ICU`, `libdispatch`, and `libxml2`).
+
 ## A Taxonomy of Types
 
 A key to the internal design of the framework is the split between the CF implementation and Swift implementation of the Foundation classes. They can be organized into several categories.

Docs/GettingStarted.md

@@ -12,7 +12,7 @@ In order to build on OS X, you will need:
 
 Foundation is developed at the same time as the rest of Swift, so the most recent version of the compiler is required in order to build it.
 
-The repository includes an Xcode project file as well as an Xcode workspace. The workspace includes both Foundation and XCTest, which makes it easy to build and run everything together. The workspace assumes that Foundation and XCTest are checked out from GitHub in peer directories. For example:
+The repository includes an Xcode project file as well as an Xcode workspace. The workspace includes both Foundation and XCTest, which makes it easy to build and run everything together. The workspace assumes that Foundation and XCTest are checked out from GitHub in sibling directories. For example:
 
 ```
 % cd Development
@@ -25,7 +25,7 @@ Build and test steps:
 
 0. Run Xcode with the latest toolchain. Follow [the instructions here](https://swift.org/download/#apple-platforms) to start Xcode with the correct toolchain.
 0. Open `Foundation.xcworkspace`.
-0. Build the _Foundation_ target. This builds CoreFoundation and Foundation.
+0. Build the _SwiftFoundation_ target. This builds CoreFoundation and Foundation.
 0. Run (Cmd-R) the _TestFoundation_ target. This builds CoreFoundation, Foundation, XCTest, and TestFoundation, then runs the tests.
 
 > Note: If you see the name of the XCTest project file in red in the workspace, then Xcode cannot find the cloned XCTest repository. Make sure that it is located next to the `swift-corelibs-foundation` directory and has the name `swift-corelibs-xctest`.

Foundation/NSCalendar.swift

@@ -365,11 +365,7 @@ public class NSCalendar : NSObject, NSCopying, NSSecureCoding {
     public func dateFromComponents(comps: NSDateComponents) -> NSDate? {
         var (vector, compDesc) = _convert(comps)
 
-        let oldTz = timeZone
-        let tempTz = comps.timeZone
-        if let tz = tempTz {
-            timeZone = tz
-        }
+        self.timeZone = comps.timeZone ?? timeZone
 
         var at: CFAbsoluteTime = 0.0
         let res: Bool = withUnsafeMutablePointer(&at) { t in
@@ -378,15 +374,11 @@ public class NSCalendar : NSObject, NSCopying, NSSecureCoding {
             }
         }
 
-        if tempTz != nil {
-            self.timeZone = oldTz
-        }
-        
         if res {
             return NSDate(timeIntervalSinceReferenceDate: at)
+        } else {
+            return nil
         }
-        
-        return nil
     }
 
     private func _setup(unitFlags: NSCalendarUnit, field: NSCalendarUnit, type: String, inout compDesc: [Int8]) {

Foundation/NSFileManager.swift

@@ -211,12 +211,13 @@ public class NSFileManager : NSObject {
 
         This method replaces fileAttributesAtPath:traverseLink:.
      */
-    public func attributesOfItemAtPath(path: String) throws -> [String : AnyObject] {
+    /// - Experiment: Note that the return type of this function is different than on Darwin Foundation (Any instead of AnyObject). This is likely to change once we have a more complete story for bridging in place.
+    public func attributesOfItemAtPath(path: String) throws -> [String : Any] {
         var s = stat()
         guard lstat(path, &s) == 0 else {
             throw _NSErrorWithErrno(errno, reading: true, path: path)
         }
-        var result = [String : AnyObject]()
+        var result = [String : Any]()
         result[NSFileSize] = NSNumber(unsignedLongLong: UInt64(s.st_size))
 
 #if os(OSX) || os(iOS)
@@ -233,14 +234,14 @@ public class NSFileManager : NSObject {
 
         let pwd = getpwuid(s.st_uid)
         if pwd != nil && pwd.memory.pw_name != nil {
-            if let name = NSString(bytes: pwd.memory.pw_name, length: Int(strlen(pwd.memory.pw_name)), encoding: NSUTF8StringEncoding) {
+            if let name = String.fromCString(pwd.memory.pw_name) {
                 result[NSFileOwnerAccountName] = name
             }
         }
 
         let grd = getgrgid(s.st_gid)
         if grd != nil && grd.memory.gr_name != nil {
-            if let name = NSString(bytes: grd.memory.gr_name, length: Int(strlen(grd.memory.gr_name)), encoding: NSUTF8StringEncoding) {
+            if let name = String.fromCString(grd.memory.gr_name) {
                 result[NSFileGroupOwnerAccountID] = name
             }
         }
@@ -255,7 +256,7 @@ public class NSFileManager : NSObject {
             case S_IFSOCK: type = NSFileTypeSocket
             default: type = NSFileTypeUnknown
         }
-        result[NSFileType] = NSString(type)
+        result[NSFileType] = type
 
         if type == NSFileTypeBlockSpecial || type == NSFileTypeCharacterSpecial {
             result[NSFileDeviceIdentifier] = NSNumber(unsignedLongLong: UInt64(s.st_rdev))

Foundation/NSIndexPath.swift

@@ -15,10 +15,7 @@ public class NSIndexPath : NSObject, NSCopying, NSSecureCoding {
         _indexes = []
     }
     public init(indexes: UnsafePointer<Int>, length: Int) {
-        _indexes = []
-        for var idx = 0; idx < length; idx++ {
-            _indexes.append(indexes[idx])
-        }
+        _indexes = Array(UnsafeBufferPointer(start: indexes, count: length))
     }
 
     private init(indexes: [Int]) {

Foundation/NSIndexSet.swift

@@ -484,12 +484,10 @@ public class NSMutableIndexSet : NSIndexSet {
     }
 
     public func addIndex(value: Int) {
-        // TODO: Bounds checking
         self.addIndexesInRange(NSMakeRange(value, 1))
     }
 
     public func removeIndex(value: Int) {
-        // TODO: Bounds checking
         self.removeIndexesInRange(NSMakeRange(value, 1))
     }
 

Foundation/NSURLError.swift

@@ -12,20 +12,20 @@
     @discussion Constants used by NSError to differentiate between "domains" of error codes, serving as a discriminator for error codes that originate from different subsystems or sources.
     @constant NSURLErrorDomain Indicates an NSURL error.
 */
-public let NSURLErrorDomain: String = "" // NSUnimplemented
+public let NSURLErrorDomain: String = "NSURLErrorDomain"
 
 /*!
     @const NSURLErrorFailingURLErrorKey
     @abstract The NSError userInfo dictionary key used to store and retrieve the URL which caused a load to fail.
 */
-public let NSURLErrorFailingURLErrorKey: String = "" // NSUnimplemented
+public let NSURLErrorFailingURLErrorKey: String = "NSErrorFailingURLKey"
 
 /*!
     @const NSURLErrorFailingURLStringErrorKey
     @abstract The NSError userInfo dictionary key used to store and retrieve the NSString object for the URL which caused a load to fail.
     @discussion This constant supersedes NSErrorFailingURLStringKey, which was deprecated in Mac OS X 10.6.  Both constants refer to the same value for backward-compatibility, but this symbol name has a better prefix.
 */
-public let NSURLErrorFailingURLStringErrorKey: String = "" // NSUnimplemented
+public let NSURLErrorFailingURLStringErrorKey: String = "NSErrorFailingURLStringKey"
 
 /*!
     @const NSErrorFailingURLStringKey
@@ -37,14 +37,14 @@ public let NSURLErrorFailingURLStringErrorKey: String = "" // NSUnimplemented
     @const NSURLErrorFailingURLPeerTrustErrorKey
     @abstract The NSError userInfo dictionary key used to store and retrieve the SecTrustRef object representing the state of a failed SSL handshake.
  */
-public let NSURLErrorFailingURLPeerTrustErrorKey: String = "" // NSUnimplemented
+public let NSURLErrorFailingURLPeerTrustErrorKey: String = "NSURLErrorFailingURLPeerTrustErrorKey"
 
 /*!
     @const NSURLErrorBackgroundTaskCancelledReasonKey
     @abstract The NSError userInfo dictionary key used to store and retrieve the NSNumber corresponding to the reason why a background
 	NSURLSessionTask was cancelled
  */
-public let NSURLErrorBackgroundTaskCancelledReasonKey: String = "" // NSUnimplemented
+public let NSURLErrorBackgroundTaskCancelledReasonKey: String = "NSURLErrorBackgroundTaskCancelledReasonKey"
 
 /*!
     @enum Codes associated with NSURLErrorBackgroundTaskCancelledReasonKey

README.md

@@ -24,7 +24,7 @@ In our first year, we are not looking to make major API changes to the library.
 
 ### API Naming and Foundation
 
-One of the goals of the Swift 3 project is [a new set of naming guidelines](https://swift.org/documentation/api-design-guidelines.html). The Foundation project will soon update all of its names to match the new guidelines. We will also drop the 'NS' prefix from all classes.
+One of the goals of the Swift 3 project is [a new set of naming guidelines](https://swift.org/documentation/api-design-guidelines.html). The Foundation project will soon update all of its names to match the new guidelines. We will also drop the 'NS' prefix from all Foundation classes.
 
 ### Current Status
 

TestFoundation/TestNSFileManager.swift

@@ -96,8 +96,33 @@ class TestNSFileManger : XCTestCase {
 
         do {
             let attrs = try fm.attributesOfItemAtPath(path)
-            // TODO: Actually verify the contents of the dictionary.
+            
             XCTAssertTrue(attrs.count > 0)
+            
+            let fileSize = attrs[NSFileSize] as? NSNumber
+            XCTAssertEqual(fileSize!.longLongValue, 0)
+            
+            let fileModificationDate = attrs[NSFileModificationDate] as? NSDate
+            XCTAssertGreaterThan(NSDate().timeIntervalSince1970, fileModificationDate!.timeIntervalSince1970)
+            
+            let filePosixPermissions = attrs[NSFilePosixPermissions] as? NSNumber
+            XCTAssertNotEqual(filePosixPermissions!.longLongValue, 0)
+            
+            let fileReferenceCount = attrs[NSFileReferenceCount] as? NSNumber
+            XCTAssertEqual(fileReferenceCount!.longLongValue, 1)
+            
+            let fileSystemNumber = attrs[NSFileSystemNumber] as? NSNumber
+            XCTAssertNotEqual(fileSystemNumber!.longLongValue, 0)
+            
+            let fileSystemFileNumber = attrs[NSFileSystemFileNumber] as? NSNumber
+            XCTAssertNotEqual(fileSystemFileNumber!.longLongValue, 0)
+            
+            let fileType = attrs[NSFileType] as? String
+            XCTAssertEqual(fileType!, NSFileTypeRegular)
+            
+            let fileOwnerAccountID = attrs[NSFileOwnerAccountID] as? NSNumber
+            XCTAssertNotEqual(fileOwnerAccountID!.longLongValue, 0)
+            
         } catch let err {
             XCTFail("\(err)")
         }