Skip to content

Align NSNumber/NSDecimalNumber API to Darwin version #345

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 2 commits into from
May 3, 2016
Merged

Align NSNumber/NSDecimalNumber API to Darwin version #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff1c178
align NSNumber API to Darwin version
tomquist May 1, 2016
e6b49cf
Use ``x as Int`` instead of ``Int(x)`` and broke NSArray construction…
tomquist May 3, 2016
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
32 changes: 16 additions & 16 deletions Foundation/NSDecimalNumber.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,37 +55,37 @@ public class NSDecimalNumber : NSNumber {
NSRequiresConcreteImplementation()
}

public override func descriptionWithLocale(_ locale: AnyObject?) -> String { NSUnimplemented() }
public override func description(withLocale locale: AnyObject?) -> String { NSUnimplemented() }

// TODO: "declarations from extensions cannot be overridden yet"
// Although it's not clear we actually need to redeclare this here when the extension adds it to the superclass of this class
// public var decimalValue: NSDecimal { NSUnimplemented() }

public class func zero() -> NSDecimalNumber { NSUnimplemented() }
public class func one() -> NSDecimalNumber { NSUnimplemented() }
public class func minimumDecimalNumber() -> NSDecimalNumber { NSUnimplemented() }
public class func maximumDecimalNumber() -> NSDecimalNumber { NSUnimplemented() }
public class func minimum() -> NSDecimalNumber { NSUnimplemented() }
public class func maximum() -> NSDecimalNumber { NSUnimplemented() }
public class func notANumber() -> NSDecimalNumber { NSUnimplemented() }

public func decimalNumberByAdding(_ decimalNumber: NSDecimalNumber) -> NSDecimalNumber { NSUnimplemented() }
public func decimalNumberByAdding(_ decimalNumber: NSDecimalNumber, withBehavior behavior: NSDecimalNumberBehaviors?) -> NSDecimalNumber { NSUnimplemented() }
public func adding(_ decimalNumber: NSDecimalNumber) -> NSDecimalNumber { NSUnimplemented() }
public func adding(_ decimalNumber: NSDecimalNumber, withBehavior behavior: NSDecimalNumberBehaviors?) -> NSDecimalNumber { NSUnimplemented() }

public func decimalNumberBySubtracting(_ decimalNumber: NSDecimalNumber) -> NSDecimalNumber { NSUnimplemented() }
public func decimalNumberBySubtracting(_ decimalNumber: NSDecimalNumber, withBehavior behavior: NSDecimalNumberBehaviors?) -> NSDecimalNumber { NSUnimplemented() }
public func subtracting(_ decimalNumber: NSDecimalNumber) -> NSDecimalNumber { NSUnimplemented() }
public func subtracting(_ decimalNumber: NSDecimalNumber, withBehavior behavior: NSDecimalNumberBehaviors?) -> NSDecimalNumber { NSUnimplemented() }

public func decimalNumberByMultiplyingBy(_ decimalNumber: NSDecimalNumber) -> NSDecimalNumber { NSUnimplemented() }
public func decimalNumberByMultiplyingBy(_ decimalNumber: NSDecimalNumber, withBehavior behavior: NSDecimalNumberBehaviors?) -> NSDecimalNumber { NSUnimplemented() }
public func multiplying(by decimalNumber: NSDecimalNumber) -> NSDecimalNumber { NSUnimplemented() }
public func multiplying(by decimalNumber: NSDecimalNumber, withBehavior behavior: NSDecimalNumberBehaviors?) -> NSDecimalNumber { NSUnimplemented() }

public func decimalNumberByDividingBy(_ decimalNumber: NSDecimalNumber) -> NSDecimalNumber { NSUnimplemented() }
public func decimalNumberByDividingBy(_ decimalNumber: NSDecimalNumber, withBehavior behavior: NSDecimalNumberBehaviors?) -> NSDecimalNumber { NSUnimplemented() }
public func dividing(by decimalNumber: NSDecimalNumber) -> NSDecimalNumber { NSUnimplemented() }
public func dividing(by decimalNumber: NSDecimalNumber, withBehavior behavior: NSDecimalNumberBehaviors?) -> NSDecimalNumber { NSUnimplemented() }

public func decimalNumberByRaisingToPower(_ power: Int) -> NSDecimalNumber { NSUnimplemented() }
public func decimalNumberByRaisingToPower(_ power: Int, withBehavior behavior: NSDecimalNumberBehaviors?) -> NSDecimalNumber { NSUnimplemented() }
public func raising(toPower power: Int) -> NSDecimalNumber { NSUnimplemented() }
public func raising(toPower power: Int, withBehavior behavior: NSDecimalNumberBehaviors?) -> NSDecimalNumber { NSUnimplemented() }

public func decimalNumberByMultiplyingByPowerOf10(_ power: Int16) -> NSDecimalNumber { NSUnimplemented() }
public func decimalNumberByMultiplyingByPowerOf10(_ power: Int16, withBehavior behavior: NSDecimalNumberBehaviors?) -> NSDecimalNumber { NSUnimplemented() }
public func multiplying(byPowerOf10 power: Int16) -> NSDecimalNumber { NSUnimplemented() }
public func multiplying(byPowerOf10 power: Int16, withBehavior behavior: NSDecimalNumberBehaviors?) -> NSDecimalNumber { NSUnimplemented() }

public func decimalNumberByRoundingAccordingToBehavior(_ behavior: NSDecimalNumberBehaviors?) -> NSDecimalNumber { NSUnimplemented() }
public func rounding(accordingToBehavior behavior: NSDecimalNumberBehaviors?) -> NSDecimalNumber { NSUnimplemented() }
// Round to the scale of the behavior.

public override func compare(_ decimalNumber: NSNumber) -> NSComparisonResult { NSUnimplemented() }
Expand Down
4 changes: 2 additions & 2 deletions Foundation/NSDictionary.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ public class NSDictionary : NSObject, NSCopying, NSMutableCopying, NSSecureCodin
} else if key is NSDate {
line += (key as! NSDate).descriptionWithLocale(locale)
} else if key is NSDecimalNumber {
line += (key as! NSDecimalNumber).descriptionWithLocale(locale)
line += (key as! NSDecimalNumber).description(withLocale: locale)
} else if key is NSDictionary {
line += (key as! NSDictionary).descriptionWithLocale(locale, indent: level + 1)
} else if key is NSOrderedSet {
Expand All @@ -387,7 +387,7 @@ public class NSDictionary : NSObject, NSCopying, NSMutableCopying, NSSecureCodin
} else if object is NSDate {
line += (object as! NSDate).descriptionWithLocale(locale)
} else if object is NSDecimalNumber {
line += (object as! NSDecimalNumber).descriptionWithLocale(locale)
line += (object as! NSDecimalNumber).description(withLocale: locale)
} else if object is NSDictionary {
line += (object as! NSDictionary).descriptionWithLocale(locale, indent: level + 1)
} else if object is NSOrderedSet {
Expand Down
24 changes: 12 additions & 12 deletions Foundation/NSFileManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,9 +179,9 @@ public class NSFileManager : NSObject {
fatalError("Can't set file permissions to \(attributes[attribute])")
}
#if os(OSX) || os(iOS)
let modeT = number.unsignedShortValue
let modeT = number.uint16Value
#elseif os(Linux)
let modeT = number.unsignedIntValue
let modeT = number.uint32Value
#endif
if chmod(path, modeT) != 0 {
fatalError("errno \(errno)")
Expand Down Expand Up @@ -337,7 +337,7 @@ public class NSFileManager : NSObject {
throw _NSErrorWithErrno(errno, reading: true, path: path)
}
var result = [String : Any]()
result[NSFileSize] = NSNumber(unsignedLongLong: UInt64(s.st_size))
result[NSFileSize] = NSNumber(value: UInt64(s.st_size))

#if os(OSX) || os(iOS)
let ti = (NSTimeInterval(s.st_mtimespec.tv_sec) - kCFAbsoluteTimeIntervalSince1970) + (1.0e-9 * NSTimeInterval(s.st_mtimespec.tv_nsec))
Expand All @@ -346,10 +346,10 @@ public class NSFileManager : NSObject {
#endif
result[NSFileModificationDate] = NSDate(timeIntervalSinceReferenceDate: ti)

result[NSFilePosixPermissions] = NSNumber(unsignedLongLong: UInt64(s.st_mode & 0o7777))
result[NSFileReferenceCount] = NSNumber(unsignedLongLong: UInt64(s.st_nlink))
result[NSFileSystemNumber] = NSNumber(unsignedLongLong: UInt64(s.st_dev))
result[NSFileSystemFileNumber] = NSNumber(unsignedLongLong: UInt64(s.st_ino))
result[NSFilePosixPermissions] = NSNumber(value: UInt64(s.st_mode & 0o7777))
result[NSFileReferenceCount] = NSNumber(value: UInt64(s.st_nlink))
result[NSFileSystemNumber] = NSNumber(value: UInt64(s.st_dev))
result[NSFileSystemFileNumber] = NSNumber(value: UInt64(s.st_ino))

let pwd = getpwuid(s.st_uid)
if pwd != nil && pwd.pointee.pw_name != nil {
Expand All @@ -376,19 +376,19 @@ public class NSFileManager : NSObject {
result[NSFileType] = type

if type == NSFileTypeBlockSpecial || type == NSFileTypeCharacterSpecial {
result[NSFileDeviceIdentifier] = NSNumber(unsignedLongLong: UInt64(s.st_rdev))
result[NSFileDeviceIdentifier] = NSNumber(value: UInt64(s.st_rdev))
}

#if os(OSX) || os(iOS)
if (s.st_flags & UInt32(UF_IMMUTABLE | SF_IMMUTABLE)) != 0 {
result[NSFileImmutable] = NSNumber(bool: true)
result[NSFileImmutable] = NSNumber(value: true)
}
if (s.st_flags & UInt32(UF_APPEND | SF_APPEND)) != 0 {
result[NSFileAppendOnly] = NSNumber(bool: true)
result[NSFileAppendOnly] = NSNumber(value: true)
}
#endif
result[NSFileOwnerAccountID] = NSNumber(unsignedLongLong: UInt64(s.st_uid))
result[NSFileGroupOwnerAccountID] = NSNumber(unsignedLongLong: UInt64(s.st_gid))
result[NSFileOwnerAccountID] = NSNumber(value: UInt64(s.st_uid))
result[NSFileGroupOwnerAccountID] = NSNumber(value: UInt64(s.st_gid))

return result
}
Expand Down
2 changes: 1 addition & 1 deletion Foundation/NSGeometry.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -957,7 +957,7 @@ extension NSCoder {
private extension NSCoder {
func _encodeCGFloat(_ value: CGFloat) {
if let keyedArchiver = self as? NSKeyedArchiver {
keyedArchiver._encodeValue(NSNumber(double: value.native))
keyedArchiver._encodeValue(NSNumber(value: value.native))
} else {
NSUnimplemented()
}
Expand Down
2 changes: 1 addition & 1 deletion Foundation/NSHTTPCookie.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ public class NSHTTPCookie : NSObject {
_portList = portString.characters
.split(separator: ",")
.flatMap { Int(String($0)) }
.map { NSNumber(integer: $0) }
.map { NSNumber(value: $0) }
} else {
_portList = nil
}
Expand Down
32 changes: 16 additions & 16 deletions Foundation/NSKeyedArchiver.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,39 +665,39 @@ public class NSKeyedArchiver : NSCoder {
break
case .Char:
let charp = unsafeBitCast(addr, to: UnsafePointer<CChar>.self)
_encodeValue(NSNumber(char: charp.pointee))
_encodeValue(NSNumber(value: charp.pointee))
break
case .UChar:
let ucharp = unsafeBitCast(addr, to: UnsafePointer<UInt8>.self)
_encodeValue(NSNumber(unsignedChar: ucharp.pointee))
_encodeValue(NSNumber(value: ucharp.pointee))
break
case .Int, .Long:
let intp = unsafeBitCast(addr, to: UnsafePointer<Int32>.self)
_encodeValue(NSNumber(int: intp.pointee))
_encodeValue(NSNumber(value: intp.pointee))
break
case .UInt, .ULong:
let uintp = unsafeBitCast(addr, to: UnsafePointer<UInt32>.self)
_encodeValue(NSNumber(unsignedInt: uintp.pointee))
_encodeValue(NSNumber(value: uintp.pointee))
break
case .LongLong:
let longlongp = unsafeBitCast(addr, to: UnsafePointer<Int64>.self)
_encodeValue(NSNumber(longLong: longlongp.pointee))
_encodeValue(NSNumber(value: longlongp.pointee))
break
case .ULongLong:
let ulonglongp = unsafeBitCast(addr, to: UnsafePointer<UInt64>.self)
_encodeValue(NSNumber(unsignedLongLong: ulonglongp.pointee))
_encodeValue(NSNumber(value: ulonglongp.pointee))
break
case .Float:
let floatp = unsafeBitCast(addr, to: UnsafePointer<Float>.self)
_encodeValue(NSNumber(float: floatp.pointee))
_encodeValue(NSNumber(value: floatp.pointee))
break
case .Double:
let doublep = unsafeBitCast(addr, to: UnsafePointer<Double>.self)
_encodeValue(NSNumber(double: doublep.pointee))
_encodeValue(NSNumber(value: doublep.pointee))
break
case .Bool:
let boolp = unsafeBitCast(addr, to: UnsafePointer<Bool>.self)
_encodeValue(NSNumber(bool: boolp.pointee))
_encodeValue(NSNumber(value: boolp.pointee))
break
case .CharPtr:
let charpp = unsafeBitCast(addr, to: UnsafePointer<UnsafePointer<Int8>>.self)
Expand Down Expand Up @@ -738,31 +738,31 @@ public class NSKeyedArchiver : NSCoder {
}

public override func encodeBool(_ boolv: Bool, forKey key: String) {
_encodeValue(NSNumber(bool: boolv), forKey: key)
_encodeValue(NSNumber(value: boolv), forKey: key)
}

public override func encodeInt(_ intv: Int32, forKey key: String) {
_encodeValue(NSNumber(int: intv), forKey: key)
_encodeValue(NSNumber(value: intv), forKey: key)
}

public override func encodeInt32(_ intv: Int32, forKey key: String) {
_encodeValue(NSNumber(int: intv), forKey: key)
_encodeValue(NSNumber(value: intv), forKey: key)
}

public override func encodeInt64(_ intv: Int64, forKey key: String) {
_encodeValue(NSNumber(longLong: intv), forKey: key)
_encodeValue(NSNumber(value: intv), forKey: key)
}

public override func encodeFloat(_ realv: Float, forKey key: String) {
_encodeValue(NSNumber(float: realv), forKey: key)
_encodeValue(NSNumber(value: realv), forKey: key)
}

public override func encodeDouble(_ realv: Double, forKey key: String) {
_encodeValue(NSNumber(double: realv), forKey: key)
_encodeValue(NSNumber(value: realv), forKey: key)
}

public override func encodeInteger(_ intv: Int, forKey key: String) {
_encodeValue(NSNumber(long: intv), forKey: key)
_encodeValue(NSNumber(value: intv), forKey: key)
}

public override func encodeDataObject(_ data: NSData) {
Expand Down
22 changes: 11 additions & 11 deletions Foundation/NSKeyedUnarchiver.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ public class NSKeyedUnarchiver : NSCoder {
}

let version = unwrappedPlist["$version"] as? NSNumber
if version?.intValue != Int32(NSKeyedArchivePlistVersion) {
if version?.int32Value != Int32(NSKeyedArchivePlistVersion) {
throw _decodingError(NSCocoaError.PropertyListReadCorruptError,
withDescription: "Unknown archive version. The data may be corrupt.")
}
Expand Down Expand Up @@ -713,21 +713,21 @@ public class NSKeyedUnarchiver : NSCoder {
guard let result : NSNumber = _decodeValue(forKey: key) else {
return 0
}
return result.intValue
return result.int32Value
}

public override func decodeInt32ForKey(_ key: String) -> Int32 {
guard let result : NSNumber = _decodeValue(forKey: key) else {
return 0
}
return result.intValue
return result.int32Value
}

public override func decodeInt64ForKey(_ key: String) -> Int64 {
guard let result : NSNumber = _decodeValue(forKey: key) else {
return 0
}
return result.longLongValue
return result.int64Value
}

public override func decodeFloatForKey(_ key: String) -> Float {
Expand All @@ -748,7 +748,7 @@ public class NSKeyedUnarchiver : NSCoder {
guard let result : NSNumber = _decodeValue(forKey: key) else {
return 0
}
return result.longValue
return result.intValue
}

// returned bytes immutable, and they go away with the unarchiver, not the containing autorelease pool
Expand Down Expand Up @@ -783,32 +783,32 @@ public class NSKeyedUnarchiver : NSCoder {
break
case .Char:
if let ns : NSNumber = _decodeValue() {
unsafeBitCast(addr, to: UnsafeMutablePointer<CChar>.self).pointee = ns.charValue
unsafeBitCast(addr, to: UnsafeMutablePointer<CChar>.self).pointee = ns.int8Value
}
break
case .UChar:
if let ns : NSNumber = _decodeValue() {
unsafeBitCast(addr, to: UnsafeMutablePointer<UInt8>.self).pointee = ns.unsignedCharValue
unsafeBitCast(addr, to: UnsafeMutablePointer<UInt8>.self).pointee = ns.uint8Value
}
break
case .Int, .Long:
if let ns : NSNumber = _decodeValue() {
unsafeBitCast(addr, to: UnsafeMutablePointer<Int32>.self).pointee = ns.intValue
unsafeBitCast(addr, to: UnsafeMutablePointer<Int32>.self).pointee = ns.int32Value
}
break
case .UInt, .ULong:
if let ns : NSNumber = _decodeValue() {
unsafeBitCast(addr, to: UnsafeMutablePointer<UInt32>.self).pointee = ns.unsignedIntValue
unsafeBitCast(addr, to: UnsafeMutablePointer<UInt32>.self).pointee = ns.uint32Value
}
break
case .LongLong:
if let ns : NSNumber = _decodeValue() {
unsafeBitCast(addr, to: UnsafeMutablePointer<Int64>.self).pointee = ns.longLongValue
unsafeBitCast(addr, to: UnsafeMutablePointer<Int64>.self).pointee = ns.int64Value
}
break
case .ULongLong:
if let ns : NSNumber = _decodeValue() {
unsafeBitCast(addr, to: UnsafeMutablePointer<UInt64>.self).pointee = ns.unsignedLongLongValue
unsafeBitCast(addr, to: UnsafeMutablePointer<UInt64>.self).pointee = ns.uint64Value
}
break
case .Float:
Expand Down
Loading