@@ -45,37 +45,39 @@ open class UserDefaults: NSObject {
4545 //Force the returned value to an NSObject
4646 switch CFGetTypeID ( anObj) {
4747 case CFStringGetTypeID ( ) :
48- return ( anObj as! CFString ) . _nsObject
48+ return unsafeBitCast ( anObj, to : NSString . self )
4949
5050 case CFNumberGetTypeID ( ) :
51- return ( anObj as! CFNumber ) . _nsObject
51+ return unsafeBitCast ( anObj, to : NSNumber . self )
5252
5353 case CFURLGetTypeID ( ) :
54- return ( anObj as! CFURL ) . _nsObject
54+ return unsafeBitCast ( anObj, to : NSURL . self )
5555
5656 case CFArrayGetTypeID ( ) :
57- return ( anObj as! CFArray ) . _nsObject
57+ return unsafeBitCast ( anObj, to : NSArray . self )
5858
5959 case CFDictionaryGetTypeID ( ) :
60- return ( anObj as! CFDictionary ) . _nsObject
61-
60+ return unsafeBitCast ( anObj, to : NSDictionary . self )
61+
6262 case CFDataGetTypeID ( ) :
63- return ( anObj as! CFData ) . _nsObject
63+ return unsafeBitCast ( anObj, to : NSData . self )
6464
6565 default :
6666 return getFromRegistered ( )
6767 }
6868 }
69+
6970 open func set( _ value: Any ? , forKey defaultName: String ) {
7071 guard let value = value else {
7172 CFPreferencesSetAppValue ( defaultName. _cfObject, nil , suite? . _cfObject ?? kCFPreferencesCurrentApplication)
7273 return
7374 }
7475
75- var cfType : CFTypeRef ? = nil
76+ let cfType : CFTypeRef
7677
77- //FIXME: is this needed? Am I overcomplicating things?
78- //Foundation types
78+ // Convert the input value to the internal representation. All values are
79+ // represented as CFTypeRef objects internally because we store the defaults
80+ // in a CFPreferences type.
7981 if let bType = value as? NSNumber {
8082 cfType = bType. _cfObject
8183 } else if let bType = value as? NSString {
@@ -84,11 +86,26 @@ open class UserDefaults: NSObject {
8486 cfType = bType. _cfObject
8587 } else if let bType = value as? NSDictionary {
8688 cfType = bType. _cfObject
89+ } else if let bType = value as? NSData {
90+ cfType = bType. _cfObject
91+ } else if let bType = value as? NSURL {
92+ set ( URL ( reference: bType) , forKey: defaultName)
93+ return
94+ } else if let bType = value as? String {
95+ cfType = bType. _cfObject
8796 } else if let bType = value as? URL {
8897 set ( bType, forKey: defaultName)
8998 return
99+ } else if let bType = value as? Int {
100+ var cfValue = Int64 ( bType)
101+ cfType = CFNumberCreate ( nil , kCFNumberSInt64Type, & cfValue)
102+ } else if let bType = value as? Double {
103+ var cfValue = bType
104+ cfType = CFNumberCreate ( nil , kCFNumberDoubleType, & cfValue)
90105 } else if let bType = value as? Data {
91106 cfType = bType. _cfObject
107+ } else {
108+ fatalError ( " The type of 'value' passed to UserDefaults.set(forKey:) is not supported. " )
92109 }
93110
94111 CFPreferencesSetAppValue ( defaultName. _cfObject, cfType, suite? . _cfObject ?? kCFPreferencesCurrentApplication)
@@ -140,10 +157,10 @@ open class UserDefaults: NSObject {
140157 }
141158 open func data( forKey defaultName: String ) -> Data ? {
142159 guard let aVal = object ( forKey: defaultName) ,
143- let bVal = aVal as? Data else {
160+ let bVal = aVal as? NSData else {
144161 return nil
145162 }
146- return bVal
163+ return Data ( referencing : bVal)
147164 }
148165 open func stringArray( forKey defaultName: String ) -> [ String ] ? {
149166 guard let aVal = object ( forKey: defaultName) ,
@@ -153,39 +170,61 @@ open class UserDefaults: NSObject {
153170 return _SwiftValue. fetch ( nonOptional: bVal) as? [ String ]
154171 }
155172 open func integer( forKey defaultName: String ) -> Int {
156- guard let aVal = object ( forKey: defaultName) ,
157- let bVal = aVal as? NSNumber else {
173+ guard let aVal = object ( forKey: defaultName) else {
158174 return 0
159175 }
160- return bVal. intValue
176+ if let bVal = aVal as? NSNumber {
177+ return bVal. intValue
178+ }
179+ if let bVal = aVal as? NSString {
180+ return bVal. integerValue
181+ }
182+ return 0
161183 }
162184 open func float( forKey defaultName: String ) -> Float {
163- guard let aVal = object ( forKey: defaultName) ,
164- let bVal = aVal as? NSNumber else {
185+ guard let aVal = object ( forKey: defaultName) else {
165186 return 0
166187 }
167- return bVal. floatValue
188+ if let bVal = aVal as? NSNumber {
189+ return bVal. floatValue
190+ }
191+ if let bVal = aVal as? NSString {
192+ return bVal. floatValue
193+ }
194+ return 0
168195 }
169196 open func double( forKey defaultName: String ) -> Double {
170- guard let aVal = object ( forKey: defaultName) ,
171- let bVal = aVal as? NSNumber else {
197+ guard let aVal = object ( forKey: defaultName) else {
172198 return 0
173199 }
174- return bVal. doubleValue
200+ if let bVal = aVal as? NSNumber {
201+ return bVal. doubleValue
202+ }
203+ if let bVal = aVal as? NSString {
204+ return bVal. doubleValue
205+ }
206+ return 0
175207 }
176208 open func bool( forKey defaultName: String ) -> Bool {
177- guard let aVal = object ( forKey: defaultName) ,
178- let bVal = aVal as? NSNumber else {
209+ guard let aVal = object ( forKey: defaultName) else {
179210 return false
180211 }
181- return bVal. boolValue
212+ if let bVal = aVal as? NSNumber {
213+ return bVal. boolValue
214+ }
215+ if let bVal = aVal as? NSString {
216+ return bVal. boolValue
217+ }
218+ return false
182219 }
183220 open func url( forKey defaultName: String ) -> URL ? {
184221 guard let aVal = object ( forKey: defaultName) else {
185222 return nil
186223 }
187224
188- if let bVal = aVal as? NSString {
225+ if let bVal = aVal as? NSURL {
226+ return URL ( reference: bVal)
227+ } else if let bVal = aVal as? NSString {
189228 let cVal = bVal. expandingTildeInPath
190229
191230 return URL ( fileURLWithPath: cVal)
@@ -227,10 +266,32 @@ open class UserDefaults: NSObject {
227266
228267 open func register( defaults registrationDictionary: [ String : Any ] ) {
229268 for (key, value) in registrationDictionary {
230- registeredDefaults [ key] = value
269+ let nsValue : NSObject
270+
271+ // Converts a value to the internal representation. Internalized values are
272+ // stored as NSObject derived objects in the registration dictionary.
273+ if let val = value as? String {
274+ nsValue = val. _nsObject
275+ } else if let val = value as? URL {
276+ nsValue = val. path. _nsObject
277+ } else if let val = value as? Int {
278+ nsValue = NSNumber ( value: val)
279+ } else if let val = value as? Double {
280+ nsValue = NSNumber ( value: val)
281+ } else if let val = value as? Bool {
282+ nsValue = NSNumber ( value: val)
283+ } else if let val = value as? Data {
284+ nsValue = val. _nsObject
285+ } else if let val = value as? NSObject {
286+ nsValue = val
287+ } else {
288+ fatalError ( " The type of 'value' passed to UserDefaults.register(defaults:) is not supported. " )
289+ }
290+
291+ registeredDefaults [ key] = nsValue
231292 }
232293 }
233-
294+
234295 open func addSuite( named suiteName: String ) {
235296 CFPreferencesAddSuitePreferencesToApp ( kCFPreferencesCurrentApplication, suiteName. _cfObject)
236297 }
0 commit comments