@@ -12,10 +12,10 @@ import CoreFoundation
12
12
public class NSNumberFormatter : NSFormatter {
13
13
14
14
typealias CFType = CFNumberFormatterRef
15
- internal var __cfObject : CFType ?
16
- internal var _cfObject : CFType {
15
+ internal var _currentCfFormatter : CFType ?
16
+ internal var _cfFormatter : CFType {
17
17
get {
18
- if let obj = __cfObject {
18
+ if let obj = _currentCfFormatter {
19
19
return obj
20
20
} else {
21
21
#if os(OSX) || os(iOS)
@@ -26,7 +26,7 @@ public class NSNumberFormatter : NSFormatter {
26
26
27
27
let obj = CFNumberFormatterCreate ( kCFAllocatorSystemDefault, locale. _cfObject, numberStyle)
28
28
_setFormatterAttributes ( obj)
29
- __cfObject = obj
29
+ _currentCfFormatter = obj
30
30
return obj
31
31
}
32
32
}
@@ -44,14 +44,14 @@ public class NSNumberFormatter : NSFormatter {
44
44
// Even though NSNumberFormatter responds to the usual NSFormatter methods,
45
45
// here are some convenience methods which are a little more obvious.
46
46
public func stringFromNumber( number: NSNumber ) -> String ? {
47
- return CFNumberFormatterCreateStringWithNumber ( kCFAllocatorSystemDefault, _cfObject , number. _cfObject) . _swiftObject
47
+ return CFNumberFormatterCreateStringWithNumber ( kCFAllocatorSystemDefault, _cfFormatter , number. _cfObject) . _swiftObject
48
48
}
49
49
50
50
public func numberFromString( string: String ) -> NSNumber ? {
51
51
var range = CFRange ( )
52
52
let number = withUnsafeMutablePointer ( & range) { ( rangePointer: UnsafeMutablePointer < CFRange > ) -> NSNumber ? in
53
53
let options = CFNumberFormatterOptionFlags . ParseIntegersOnly. rawValue
54
- let result = CFNumberFormatterCreateNumberFromString ( kCFAllocatorSystemDefault, _cfObject , string. _cfObject, rangePointer, options)
54
+ let result = CFNumberFormatterCreateNumberFromString ( kCFAllocatorSystemDefault, _cfFormatter , string. _cfObject, rangePointer, options)
55
55
return result? . _nsObject
56
56
}
57
57
return number
@@ -64,7 +64,7 @@ public class NSNumberFormatter : NSFormatter {
64
64
}
65
65
66
66
internal func _reset( ) {
67
- __cfObject = nil
67
+ _currentCfFormatter = nil
68
68
}
69
69
70
70
internal func _setFormatterAttributes( formatter: CFNumberFormatterRef ) {
0 commit comments