Skip to content

Commit ef329ed

Browse files
committed
Better internal var naming in order to avoid confusion.
1 parent f05ce39 commit ef329ed

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Foundation/NSNumberFormatter.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import CoreFoundation
1212
public class NSNumberFormatter : NSFormatter {
1313

1414
typealias CFType = CFNumberFormatterRef
15-
internal var __cfObject: CFType?
16-
internal var _cfObject: CFType {
15+
internal var _currentCfFormatter: CFType?
16+
internal var _cfFormatter: CFType {
1717
get {
18-
if let obj = __cfObject {
18+
if let obj = _currentCfFormatter {
1919
return obj
2020
} else {
2121
#if os(OSX) || os(iOS)
@@ -26,7 +26,7 @@ public class NSNumberFormatter : NSFormatter {
2626

2727
let obj = CFNumberFormatterCreate(kCFAllocatorSystemDefault, locale._cfObject, numberStyle)
2828
_setFormatterAttributes(obj)
29-
__cfObject = obj
29+
_currentCfFormatter = obj
3030
return obj
3131
}
3232
}
@@ -44,14 +44,14 @@ public class NSNumberFormatter : NSFormatter {
4444
// Even though NSNumberFormatter responds to the usual NSFormatter methods,
4545
// here are some convenience methods which are a little more obvious.
4646
public func stringFromNumber(number: NSNumber) -> String? {
47-
return CFNumberFormatterCreateStringWithNumber(kCFAllocatorSystemDefault, _cfObject, number._cfObject)._swiftObject
47+
return CFNumberFormatterCreateStringWithNumber(kCFAllocatorSystemDefault, _cfFormatter, number._cfObject)._swiftObject
4848
}
4949

5050
public func numberFromString(string: String) -> NSNumber? {
5151
var range = CFRange()
5252
let number = withUnsafeMutablePointer(&range) { (rangePointer: UnsafeMutablePointer<CFRange>) -> NSNumber? in
5353
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)
5555
return result?._nsObject
5656
}
5757
return number
@@ -64,7 +64,7 @@ public class NSNumberFormatter : NSFormatter {
6464
}
6565

6666
internal func _reset() {
67-
__cfObject = nil
67+
_currentCfFormatter = nil
6868
}
6969

7070
internal func _setFormatterAttributes(formatter: CFNumberFormatterRef) {

0 commit comments

Comments
 (0)