Skip to content

Initial implementation of NSNumberFormatter. #132

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 1 commit into from
Dec 16, 2015
Merged

Initial implementation of NSNumberFormatter. #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions Docs/Status.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ As Foundation is a work in progress, not all methods and functionality are prese

* `NSFormatter` is fully implemented.
* `NSDateFormatter` is mostly implemented.
* `NSNumberFormatter` is mostly implemented.
* The remaining formatters are not yet implemented.


Expand Down
8 changes: 7 additions & 1 deletion Foundation.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@
84BA558E1C16F90900F48C54 /* TestNSTimeZone.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84BA558D1C16F90900F48C54 /* TestNSTimeZone.swift */; };
88D28DE71C13AE9000494606 /* TestNSGeometry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88D28DE61C13AE9000494606 /* TestNSGeometry.swift */; };
A5A34B561C18C85D00FD972B /* TestNSByteCountFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5A34B551C18C85D00FD972B /* TestNSByteCountFormatter.swift */; };
AA664D4F1C1B03CA00C22186 /* TestNSNumberFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA664D4E1C1B03CA00C22186 /* TestNSNumberFormatter.swift */; };
C2A9D75C1C15C08B00993803 /* TestNSUUID.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2A9D75B1C15C08B00993803 /* TestNSUUID.swift */; };
C93559291C12C49F009FD6A9 /* TestNSAffineTransform.swift in Sources */ = {isa = PBXBuildFile; fileRef = C93559281C12C49F009FD6A9 /* TestNSAffineTransform.swift */; };
DCDBB8331C1768AC00313299 /* TestNSData.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCDBB8321C1768AC00313299 /* TestNSData.swift */; };
Expand Down Expand Up @@ -551,6 +552,7 @@
84BA558D1C16F90900F48C54 /* TestNSTimeZone.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSTimeZone.swift; sourceTree = "<group>"; };
88D28DE61C13AE9000494606 /* TestNSGeometry.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSGeometry.swift; sourceTree = "<group>"; };
A5A34B551C18C85D00FD972B /* TestNSByteCountFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSByteCountFormatter.swift; sourceTree = "<group>"; };
AA664D4E1C1B03CA00C22186 /* TestNSNumberFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSNumberFormatter.swift; sourceTree = "<group>"; };
C2A9D75B1C15C08B00993803 /* TestNSUUID.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSUUID.swift; sourceTree = "<group>"; };
C93559281C12C49F009FD6A9 /* TestNSAffineTransform.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSAffineTransform.swift; sourceTree = "<group>"; };
DCDBB8321C1768AC00313299 /* TestNSData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSData.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1077,6 +1079,9 @@
7A7D6FBA1C16439400957E2E /* TestNSURLResponse.swift */,
C2A9D75B1C15C08B00993803 /* TestNSUUID.swift */,
5B40F9F11C125187000E72E3 /* TestNSXMLParser.swift */,
A5A34B551C18C85D00FD972B /* TestNSByteCountFormatter.swift */,
612952F81C1B235900BE0FD9 /* TestNSNull.swift */,
AA664D4E1C1B03CA00C22186 /* TestNSNumberFormatter.swift */,
);
name = Tests;
sourceTree = "<group>";
Expand Down Expand Up @@ -1799,7 +1804,8 @@
6E203B8D1C1303BB003B2576 /* TestNSBundle.swift in Sources */,
88D28DE71C13AE9000494606 /* TestNSGeometry.swift in Sources */,
EA66F64C1BF1619600136161 /* TestNSDictionary.swift in Sources */,
ED58F76F1C134B3A00E6A5BE /* (null) in Sources */,
ED58F76F1C134B3A00E6A5BE /* TestNSJSONSerialization.swift in Sources */,
AA664D4F1C1B03CA00C22186 /* TestNSNumberFormatter.swift in Sources */,
EA66F6581BF1619600136161 /* TestNSURL.swift in Sources */,
EA66F6441BF1619600136161 /* main.swift in Sources */,
);
Expand Down
2 changes: 1 addition & 1 deletion Foundation.xcodeproj/xcshareddata/xcschemes/SwiftFoundation.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0710"
version = "1.3">
version = "1.8">
<BuildAction
parallelizeBuildables = "NO"
buildImplicitDependencies = "NO">
Expand Down
2 changes: 1 addition & 1 deletion Foundation.xcodeproj/xcshareddata/xcschemes/TestFoundation.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0710"
version = "1.3">
version = "1.8">
<BuildAction
parallelizeBuildables = "NO"
buildImplicitDependencies = "NO">
Expand Down
14 changes: 13 additions & 1 deletion Foundation/NSNumber.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ extension Double : _ObjectTypeBridgeable {
}
}

extension Bool: _ObjectTypeBridgeable {
extension Bool : _ObjectTypeBridgeable {
public init(_ number: NSNumber) {
self = number.boolValue
}
Expand All @@ -114,6 +114,13 @@ extension Bool: _ObjectTypeBridgeable {
}
}

extension Bool : _CFBridgable {
typealias CFType = CFBooleanRef
var _cfObject: CFType {
return self ? kCFBooleanTrue : kCFBooleanFalse
}
}

extension NSNumber : FloatLiteralConvertible, IntegerLiteralConvertible, BooleanLiteralConvertible {

}
Expand Down Expand Up @@ -379,3 +386,8 @@ public class NSNumber : NSValue {
return CFNumberGetTypeID()
}
}

extension CFNumberRef : _NSBridgable {
typealias NSType = NSNumber
internal var _nsObject: NSType { return unsafeBitCast(self, NSType.self) }
}
Loading