Import NSRange from the Darwin overlay (and make it mergable back) and update NSScanner (required for NSRange updates) (#1064)

Author: phausler

Foundation/NSConcreteValue.swift

@@ -39,7 +39,7 @@ internal class NSConcreteValue : NSValue {
 
                 scanner.scanLocation = 1
 
-                guard scanner.scanInteger(&count) && count > 0 else {
+                guard scanner.scanInt(&count) && count > 0 else {
                     print("NSConcreteValue.TypeInfo: array count is missing or zero")
                     return nil
                 }

Foundation/NSGeometry.swift

@@ -71,7 +71,7 @@ extension CGPoint: NSSpecialValueCoding {
         return self.x.hashValue &+ self.y.hashValue
     }
 
-     var description: String? {
+     var description: String {
         return NSStringFromPoint(self)
     }
 }
@@ -134,7 +134,7 @@ extension CGSize: NSSpecialValueCoding {
         return self.width.hashValue &+ self.height.hashValue
     }
 
-    var description: String? {
+    var description: String {
         return NSStringFromSize(self)
     }
 }
@@ -216,7 +216,7 @@ extension CGRect: NSSpecialValueCoding {
         return self.origin.hash &+ self.size.hash
     }
 
-    var description: String? {
+    var description: String {
         return NSStringFromRect(self)
     }
 }
@@ -316,8 +316,8 @@ extension NSEdgeInsets: NSSpecialValueCoding {
         return self.top.hashValue &+ self.left.hashValue &+ self.bottom.hashValue &+ self.right.hashValue
     }
 
-    var description: String? {
-        return nil
+    var description: String {
+        return ""
     }
 }
 

Foundation/NSKeyedArchiver.swift

@@ -755,7 +755,7 @@ open class NSKeyedArchiver : NSCoder {
             scanner.scanLocation = 1 // advance past ObJCType
 
             var count : Int = 0
-            guard scanner.scanInteger(&count) && count > 0 else {
+            guard scanner.scanInt(&count) && count > 0 else {
                 fatalError("NSKeyedArchiver.encodeValueOfObjCType: array count is missing or zero")
             }
 

Foundation/NSKeyedUnarchiver.swift

@@ -813,7 +813,7 @@ open class NSKeyedUnarchiver : NSCoder {
             scanner.scanLocation = 1
 
             var count : Int = 0
-            guard scanner.scanInteger(&count) && count > 0 else {
+            guard scanner.scanInt(&count) && count > 0 else {
                 fatalError("NSKeyedUnarchiver.decodeValueOfObjCType: array count is missing or zero")
             }