Drop NS from Scanner

Author: phausler

Diff for: Foundation/NSConcreteValue.swift

@@ -35,7 +35,7 @@ internal class NSConcreteValue : NSValue {
             if type == .StructBegin {
                 fatalError("NSConcreteValue.TypeInfo: cannot encode structs")
             } else if type == .ArrayBegin {
-                let scanner = NSScanner(string: spec)
+                let scanner = Scanner(string: spec)
 
                 scanner.scanLocation = 1
 

Diff for: Foundation/NSDecimalNumber.swift

@@ -142,7 +142,7 @@ extension NSNumber {
 
 // Could be silently inexact for float and double.
 
-extension NSScanner {
+extension Scanner {
 
     public func scanDecimal(_ dcm: UnsafeMutablePointer<NSDecimal>) -> Bool { NSUnimplemented() }
 }

Diff for: Foundation/NSGeometry.swift

@@ -781,7 +781,7 @@ public func NSStringFromRect(_ aRect: NSRect) -> String {
 }
 
 private func _scanDoublesFromString(_ aString: String, number: Int) -> [Double] {
-    let scanner = NSScanner(string: aString)
+    let scanner = Scanner(string: aString)
     var digitSet = CharacterSet.decimalDigits
     digitSet.insert(charactersIn: "-")
     var result = [Double](repeating: 0.0, count: number)

Diff for: Foundation/NSKeyedArchiver.swift

@@ -719,7 +719,7 @@ public class NSKeyedArchiver : NSCoder {
         if type == .StructBegin {
             fatalError("NSKeyedArchiver.encodeValueOfObjCType: this archiver cannot encode structs")
         } else if type == .ArrayBegin {
-            let scanner = NSScanner(string: String(cString: typep))
+            let scanner = Scanner(string: String(cString: typep))
 
             scanner.scanLocation = 1 // advance past ObJCType
 

Diff for: Foundation/NSKeyedUnarchiver.swift

@@ -855,7 +855,7 @@ public class NSKeyedUnarchiver : NSCoder {
         if type == .StructBegin {
             fatalError("NSKeyedUnarchiver.decodeValueOfObjCType: this archiver cannot decode structs")
         } else if type == .ArrayBegin {
-            let scanner = NSScanner(string: String(cString: typep))
+            let scanner = Scanner(string: String(cString: typep))
 
             scanner.scanLocation = 1
 

Diff for: Foundation/NSRange.swift

@@ -180,7 +180,7 @@ public func NSRangeFromString(_ aString: String) -> NSRange {
         // fail early if the string is empty
         return emptyRange
     }
-    let scanner = NSScanner(string: aString)
+    let scanner = Scanner(string: aString)
     let digitSet = CharacterSet.decimalDigits
     let _ = scanner.scanUpToCharactersFromSet(digitSet)
     if scanner.atEnd {

Diff for: Foundation/NSScanner.swift

@@ -11,7 +11,7 @@
 
 import CoreFoundation
 
-public class NSScanner : NSObject, NSCopying {
+public class Scanner: NSObject, NSCopying {
     internal var _scanString: String
     internal var _skipSet: CharacterSet?
     internal var _invertedSkipSet: CharacterSet?
@@ -22,7 +22,7 @@ public class NSScanner : NSObject, NSCopying {
     }
 
     public func copy(with zone: NSZone? = nil) -> AnyObject {
-        return NSScanner(string: string)
+        return Scanner(string: string)
     }
 
     public var string: String {
@@ -69,7 +69,7 @@ public class NSScanner : NSObject, NSCopying {
 
     public init(string: String) {
         _scanString = string
-        _skipSet = NSScanner.defaultSkipSet
+        _skipSet = Scanner.defaultSkipSet
         _scanLocation = 0
     }
 }
@@ -430,7 +430,7 @@ extension String {
     }
 }
 
-extension NSScanner {
+extension Scanner {
 
     // On overflow, the below methods will return success and clamp
     public func scanInt(_ result: UnsafeMutablePointer<Int32>) -> Bool {
@@ -510,7 +510,7 @@ extension NSScanner {
 /// Revised API for avoiding usage of AutoreleasingUnsafeMutablePointer and better Optional usage.
 /// - Experiment: This is a draft API currently under consideration for official import into Foundation as a suitable alternative
 /// - Note: Since this API is under consideration it may be either removed or revised in the near future
-extension NSScanner {
+extension Scanner {
     public func scanInt() -> Int32? {
         var value: Int32 = 0
         return withUnsafeMutablePointer(&value) { (ptr: UnsafeMutablePointer<Int32>) -> Int32? in

Diff for: Foundation/NSString.swift

@@ -639,22 +639,22 @@ extension NSString {
     }
 
     public var intValue: Int32 {
-        return NSScanner(string: _swiftObject).scanInt() ?? 0
+        return Scanner(string: _swiftObject).scanInt() ?? 0
     }
 
     public var integerValue: Int {
-        let scanner = NSScanner(string: _swiftObject)
+        let scanner = Scanner(string: _swiftObject)
         var value: Int = 0
         let _ = scanner.scanInteger(&value)
         return value
     }
 
     public var longLongValue: Int64 {
-        return NSScanner(string: _swiftObject).scanLongLong() ?? 0
+        return Scanner(string: _swiftObject).scanLongLong() ?? 0
     }
 
     public var boolValue: Bool {
-        let scanner = NSScanner(string: _swiftObject)
+        let scanner = Scanner(string: _swiftObject)
         // skip initial whitespace if present
         let _ = scanner.scanCharactersFromSet(.whitespaces)
         // scan a single optional '+' or '-' character, followed by zeroes

Diff for: TestFoundation/TestNSScanner.swift

@@ -28,7 +28,7 @@ class TestNSScanner : XCTestCase {
     }
 
     func test_scanInteger() {
-        let scanner = NSScanner(string: "123")
+        let scanner = Scanner(string: "123")
         var value: Int = 0
         XCTAssert(scanner.scanInteger(&value), "An Integer should be found in the string `123`.")
         XCTAssertEqual(value, 123, "Scanned Integer value of the string `123` should be `123`.")