Skip to content

Commit 782fd54

Browse files
committed
Add reexports of enums for mac os x targets so that usage cases are the same for .DecimalStyle etc
1 parent 08f1a56 commit 782fd54

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

Foundation/NSNumber.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ public class NSNumber : NSValue {
392392

393393
public override var description: String {
394394
let locale = CFLocaleCopyCurrent()
395-
let formatter = CFNumberFormatterCreate(nil, locale, .DecimalStyle)
395+
let formatter = CFNumberFormatterCreate(nil, locale, kCFNumberFormatterDecimalStyle)
396396
CFNumberFormatterSetProperty(formatter, kCFNumberFormatterMaxFractionDigits, 15._bridgeToObject())
397397
return CFNumberFormatterCreateStringWithNumber(nil, formatter, self._cfObject)._swiftObject
398398
}

Foundation/NSNumberFormatter.swift

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,19 @@
99

1010
import CoreFoundation
1111

12+
#if os(OSX) || os(iOS)
13+
internal let kCFNumberFormatterNoStyle = CFNumberFormatterStyle.NoStyle
14+
internal let kCFNumberFormatterDecimalStyle = CFNumberFormatterStyle.DecimalStyle
15+
internal let kCFNumberFormatterCurrencyStyle = CFNumberFormatterStyle.CurrencyStyle
16+
internal let kCFNumberFormatterPercentStyle = CFNumberFormatterStyle.PercentStyle
17+
internal let kCFNumberFormatterScientificStyle = CFNumberFormatterStyle.ScientificStyle
18+
internal let kCFNumberFormatterSpellOutStyle = CFNumberFormatterStyle.SpellOutStyle
19+
internal let kCFNumberFormatterOrdinalStyle = CFNumberFormatterStyle.OrdinalStyle
20+
internal let kCFNumberFormatterCurrencyISOCodeStyle = CFNumberFormatterStyle.CurrencyISOCodeStyle
21+
internal let kCFNumberFormatterCurrencyPluralStyle = CFNumberFormatterStyle.CurrencyPluralStyle
22+
internal let kCFNumberFormatterCurrencyAccountingStyle = CFNumberFormatterStyle.CurrencyAccountingStyle
23+
#endif
24+
1225
public class NSNumberFormatter : NSFormatter {
1326

1427
typealias CFType = CFNumberFormatterRef

0 commit comments

Comments
 (0)