Skip to content
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

Update to newer Scanner methods. #2184

Merged
merged 1 commit into from
May 2, 2019
Merged

Update to newer Scanner methods. #2184

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
4 changes: 2 additions & 2 deletions Foundation/NSGeometry.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -990,12 +990,12 @@ private func _scanDoublesFromString(_ aString: String, number: Int) -> [Double]
var result = [Double](repeating: 0.0, count: number)
var index = 0

let _ = scanner.scanUpToCharactersFromSet(digitSet)
let _ = scanner.scanUpToCharacters(from: digitSet)
while !scanner.isAtEnd && index < number {
if let num = scanner.scanDouble() {
result[index] = num
}
let _ = scanner.scanUpToCharactersFromSet(digitSet)
let _ = scanner.scanUpToCharacters(from: digitSet)
index += 1
}

Expand Down
12 changes: 6 additions & 6 deletions Foundation/NSRange.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public func NSRangeFromString(_ aString: String) -> NSRange {
}
let scanner = Scanner(string: aString)
let digitSet = CharacterSet.decimalDigits
let _ = scanner.scanUpToCharactersFromSet(digitSet)
let _ = scanner.scanUpToCharacters(from: digitSet)
if scanner.isAtEnd {
// fail early if there are no decimal digits
return emptyRange
Expand All @@ -107,7 +107,7 @@ public func NSRangeFromString(_ aString: String) -> NSRange {
// return early if there are no more characters after the first int in the string
return partialRange
}
let _ = scanner.scanUpToCharactersFromSet(digitSet)
let _ = scanner.scanUpToCharacters(from: digitSet)
if scanner.isAtEnd {
// return early if there are no integer characters after the first int in the string
return partialRange
Expand Down Expand Up @@ -152,7 +152,7 @@ extension NSRange {
}
let scanner = Scanner(string: string)
let digitSet = CharacterSet.decimalDigits
let _ = scanner.scanUpToCharacters(from: digitSet, into: nil)
let _ = scanner.scanUpToCharacters(from: digitSet)
if scanner.isAtEnd {
// fail early if there are no decimal digits
return nil
Expand All @@ -166,7 +166,7 @@ extension NSRange {
// return early if there are no more characters after the first int in the string
return nil
}
if scanner.scanString(".", into: nil) {
if scanner.scanString(".") != nil {
scanner.scanLocation = savedLocation
var double = 0.0
guard scanner.scanDouble(&double) else {
Expand All @@ -178,7 +178,7 @@ extension NSRange {
location = integral
}

let _ = scanner.scanUpToCharacters(from: digitSet, into: nil)
let _ = scanner.scanUpToCharacters(from: digitSet)
if scanner.isAtEnd {
// return early if there are no integer characters after the first int in the string
return nil
Expand All @@ -190,7 +190,7 @@ extension NSRange {
}

if !scanner.isAtEnd {
if scanner.scanString(".", into: nil) {
if scanner.scanString(".") != nil {
scanner.scanLocation = savedLocation
var double = 0.0
guard scanner.scanDouble(&double) else {
Expand Down
8 changes: 4 additions & 4 deletions Foundation/NSString.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,9 +675,9 @@ extension NSString {
public var boolValue: Bool {
let scanner = Scanner(string: _swiftObject)
// skip initial whitespace if present
let _ = scanner.scanCharactersFromSet(.whitespaces)
let _ = scanner.scanCharacters(from: .whitespaces)

if scanner.scanCharactersFromSet(CharacterSet(charactersIn: "tTyY")) != nil {
if scanner.scanCharacters(from: CharacterSet(charactersIn: "tTyY")) != nil {
return true
}

Expand All @@ -687,8 +687,8 @@ extension NSString {
}

// scan any following zeroes
let _ = scanner.scanCharactersFromSet(CharacterSet(charactersIn: "0"))
return scanner.scanCharactersFromSet(CharacterSet(charactersIn: "123456789")) != nil
let _ = scanner.scanCharacters(from: CharacterSet(charactersIn: "0"))
return scanner.scanCharacters(from: CharacterSet(charactersIn: "123456789")) != nil
}

public var uppercased: String {
Expand Down