Skip to content

Get rid of c-style for loops #158

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 1 commit into from
Dec 18, 2015
Merged

Get rid of c-style for loops #158

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
5 changes: 4 additions & 1 deletion Foundation/NSHost.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,11 @@ public class NSHost : NSObject {
if r != 0 {
return
}
for var res: UnsafeMutablePointer<addrinfo> = res0; res != nil; res = res.memory.ai_next {
var res: UnsafeMutablePointer<addrinfo> = res0
while res != nil {
let family = res.memory.ai_family
if family != AF_INET && family != AF_INET6 {
res = res.memory.ai_next
continue
}
let sa_len: socklen_t = socklen_t((family == AF_INET6) ? sizeof(sockaddr_in6) : sizeof(sockaddr_in))
Expand All @@ -101,6 +103,7 @@ public class NSHost : NSObject {
lookupInfo(&_addresses, NI_NUMERICHOST)
lookupInfo(&_names, NI_NAMEREQD)
lookupInfo(&_names, NI_NOFQDN|NI_NAMEREQD)
res = res.memory.ai_next
}

freeaddrinfo(res0)
Expand Down
4 changes: 2 additions & 2 deletions Foundation/NSXMLParser.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ internal func _NSXMLParserStartElementNs(ctx: _CFXMLInterface, localname: Unsafe
var nsDict = [String:String]()
var attrDict = [String:String]()
if nb_attributes + nb_namespaces > 0 {
for var idx = 0; idx < Int(nb_namespaces) * 2; idx += 2 {
for idx in 0.stride(to: Int(nb_namespaces) * 2, by: 2) {
var namespaceNameString: String?
var asAttrNamespaceNameString: String?
if namespaces[idx] != nil {
Expand Down Expand Up @@ -271,7 +271,7 @@ internal func _NSXMLParserStartElementNs(ctx: _CFXMLInterface, localname: Unsafe
parser._pushNamespaces(nsDict)
}

for var idx = 0; idx < Int(nb_attributes) * 5; idx += 5 {
for idx in 0.stride(to: Int(nb_attributes) * 5, by: 5) {
if attributes[idx] == nil {
continue
}
Expand Down
10 changes: 5 additions & 5 deletions TestFoundation/TestNSCharacterSet.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,29 +63,29 @@ class TestNSCharacterSet : XCTestCase {

func test_Range() {
let cset1 = NSCharacterSet(range: NSMakeRange(0x20, 40))
for var idx: unichar = 0; idx < 0xFFFF; idx++ {
for idx: unichar in 0..<0xFFFF {
XCTAssertEqual(cset1.characterIsMember(idx), (idx >= 0x20 && idx < 0x20 + 40 ? true : false))
}

let cset2 = NSCharacterSet(range: NSMakeRange(0x0000, 0xFFFF))
for var idx: unichar = 0; idx < 0xFFFF; idx++ {
for idx: unichar in 0..<0xFFFF {
XCTAssertEqual(cset2.characterIsMember(idx), true)
}

let cset3 = NSCharacterSet(range: NSMakeRange(0x0000, 10))
for var idx: unichar = 0; idx < 0xFFFF; idx++ {
for idx: unichar in 0..<0xFFFF {
XCTAssertEqual(cset3.characterIsMember(idx), (idx < 10 ? true : false))
}

let cset4 = NSCharacterSet(range: NSMakeRange(0x20, 0))
for var idx: unichar = 0; idx < 0xFFFF; idx++ {
for idx: unichar in 0..<0xFFFF {
XCTAssertEqual(cset4.characterIsMember(idx), false)
}
}

func test_String() {
let cset = NSCharacterSet(charactersInString: "abcABC")
for var idx: unichar = 0; idx < 0xFFFF; idx++ {
for idx: unichar in 0..<0xFFFF {
XCTAssertEqual(cset.characterIsMember(idx), (idx >= unichar(unicodeScalarLiteral: "a") && idx <= unichar(unicodeScalarLiteral: "c")) || (idx >= unichar(unicodeScalarLiteral: "A") && idx <= unichar(unicodeScalarLiteral: "C")) ? true : false)
}
}
Expand Down