Skip to content

Implement missing parts of UserDefaults and fix consistency issues #1408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Feb 3, 2018
+411 −168
Merged

Implement missing parts of UserDefaults and fix consistency issues #1408

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9d47821
Implement two missing features from UserDefaults:
millenomi Jan 20, 2018
ca58521
More tests.
millenomi Jan 23, 2018
c18cb07
Test using a heterogeneous dictionary.
millenomi Jan 23, 2018
18fb5f5
Cut the tests that don’t work on CI; there’ll be a follow-up for them.
millenomi Jan 24, 2018
dd3a9fa
Add persistent domains code.
millenomi Jan 24, 2018
1aff228
Substantially rewrite UserDefaults to:
millenomi Jan 24, 2018
0995aa9
Move the check for NSNumber just above the common types.
millenomi Jan 25, 2018
ac6a3f6
This was mistakenly relying on a Darwin-style bridged cast. So…:
millenomi Jan 25, 2018
fae057c
Fix the _other_ place where 'as AnyObject' was being used by refactor…
millenomi Jan 25, 2018
2134642
Fire the notification unconditionally, and check that it is posted in…
millenomi Jan 25, 2018
c60c771
Ninja does not quite support this extension arrangement.
millenomi Jan 25, 2018
1bac2b3
These two casts were implicitly relying on bridging. They don’t work …
millenomi Jan 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Foundation.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
1520469B1D8AEABE00D02E36 /* HTTPServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1520469A1D8AEABE00D02E36 /* HTTPServer.swift */; };
153E951120111DC500F250BE /* CFKnownLocations.h in Headers */ = {isa = PBXBuildFile; fileRef = 153E950F20111DC500F250BE /* CFKnownLocations.h */; settings = {ATTRIBUTES = (Private, ); }; };
153E951220111DC500F250BE /* CFKnownLocations.c in Sources */ = {isa = PBXBuildFile; fileRef = 153E951020111DC500F250BE /* CFKnownLocations.c */; };
153E95162012A29900F250BE /* UserDefaults_Arguments.swift in Sources */ = {isa = PBXBuildFile; fileRef = 153E95152012A29900F250BE /* UserDefaults_Arguments.swift */; };
159884921DCC877700E3314C /* TestHTTPCookieStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 159884911DCC877700E3314C /* TestHTTPCookieStorage.swift */; };
231503DB1D8AEE5D0061694D /* TestDecimal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 231503DA1D8AEE5D0061694D /* TestDecimal.swift */; };
294E3C1D1CC5E19300E4F44C /* TestNSAttributedString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 294E3C1C1CC5E19300E4F44C /* TestNSAttributedString.swift */; };
Expand Down Expand Up @@ -502,6 +503,7 @@
1520469A1D8AEABE00D02E36 /* HTTPServer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HTTPServer.swift; sourceTree = "<group>"; };
153E950F20111DC500F250BE /* CFKnownLocations.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CFKnownLocations.h; sourceTree = "<group>"; };
153E951020111DC500F250BE /* CFKnownLocations.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = CFKnownLocations.c; sourceTree = "<group>"; };
153E95152012A29900F250BE /* UserDefaults_Arguments.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaults_Arguments.swift; sourceTree = "<group>"; };
159884911DCC877700E3314C /* TestHTTPCookieStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestHTTPCookieStorage.swift; sourceTree = "<group>"; };
22B9C1E01C165D7A00DECFF9 /* TestDate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestDate.swift; sourceTree = "<group>"; };
231503DA1D8AEE5D0061694D /* TestDecimal.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestDecimal.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1793,6 +1795,7 @@
isa = PBXGroup;
children = (
EADE0B871BD15DFF00C49C64 /* UserDefaults.swift */,
153E95152012A29900F250BE /* UserDefaults_Arguments.swift */,
5BDC3F3B1BCC5DCB00ED97BB /* NSLocale.swift */,
5BD70FB11D3D4CDC003B9BF8 /* Locale.swift */,
);
Expand Down Expand Up @@ -2191,6 +2194,7 @@
61E0117E1C1B55B9000037DD /* Timer.swift in Sources */,
EADE0BCD1BD15E0000C49C64 /* XMLParser.swift in Sources */,
5BDC3FD01BCF17E600ED97BB /* NSCFSet.swift in Sources */,
153E95162012A29900F250BE /* UserDefaults_Arguments.swift in Sources */,
5B1FD9DE1D6D16580080E83C /* TaskRegistry.swift in Sources */,
EADE0B931BD15DFF00C49C64 /* NSComparisonPredicate.swift in Sources */,
5B1FD9DC1D6D16580080E83C /* URLSessionDelegate.swift in Sources */,
Expand Down
28 changes: 28 additions & 0 deletions Foundation/NSNumber.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,6 +622,34 @@ open class NSNumber : NSValue {
fatalError("unsupported CFNumberType: '\(numberType)'")
}
}

internal var _swiftValueOfOptimalType: Any {
if self === kCFBooleanTrue {
return true
} else if self === kCFBooleanFalse {
return false
}

let numberType = _CFNumberGetType2(_cfObject)
switch numberType {
case kCFNumberSInt8Type:
return Int(int8Value)
case kCFNumberSInt16Type:
return Int(int16Value)
case kCFNumberSInt32Type:
return Int(int32Value)
case kCFNumberSInt64Type:
return int64Value < Int.max ? Int(int64Value) : int64Value
case kCFNumberFloat32Type:
return floatValue
case kCFNumberFloat64Type:
return doubleValue
case kCFNumberSInt128Type:
return int128Value
default:
fatalError("unsupported CFNumberType: '\(numberType)'")
}
}

deinit {
_CFDeinit(self)
Expand Down
Loading