Skip to content

Commit

Permalink
Added support for Swift 2.2
Browse files Browse the repository at this point in the history 
* Added support for Swift 2.2
* Avoid curried function
* Avoid c style for-loop
  • Loading branch information
@tid-kijyun
tid-kijyun committed Mar 1, 2016
1 parent 04ff10f commit 4cd13be
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 27 deletions.
48 changes: 25 additions & 23 deletions Source/CSS.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public struct CSS {
var attributes: [String] = []
var combinator: String = ""

if let result = matchBlank(str: str) {
if let result = matchBlank(str) {
str = (str as NSString).substringFromIndex(result.range.length)
}

Expand Down Expand Up @@ -77,17 +77,19 @@ public struct CSS {
}
}

private func firstMatch(pattern: String)(str: String) -> NSTextCheckingResult? {
let length = str.utf8.count
do {
let regex = try NSRegularExpression(pattern: pattern, options: .CaseInsensitive)
if let result = regex.firstMatchInString(str, options: .ReportProgress, range: NSRange(location: 0, length: length)) {
return result
private func firstMatch(pattern: String) -> (String) -> NSTextCheckingResult? {
return { str in
let length = str.utf8.count
do {
let regex = try NSRegularExpression(pattern: pattern, options: .CaseInsensitive)
if let result = regex.firstMatchInString(str, options: .ReportProgress, range: NSRange(location: 0, length: length)) {
return result
}
} catch _ {

}
} catch _ {

return nil
}
return nil
}

private func nth(prefix prefix: String, a: Int, b: Int) -> String {
Expand Down Expand Up @@ -138,7 +140,7 @@ private func substringWithRangeAtIndex(result: NSTextCheckingResult, str: String
}

private func getElement(inout str: String, skip: Bool = true) -> String {
if let result = matchElement(str: str) {
if let result = matchElement(str) {
let (text, text2) = (substringWithRangeAtIndex(result, str: str, at: 1),
substringWithRangeAtIndex(result, str: str, at: 4))

Expand All @@ -160,7 +162,7 @@ private func getElement(inout str: String, skip: Bool = true) -> String {
}

private func getClassId(inout str: String, skip: Bool = true) -> String? {
if let result = matchClassId(str: str) {
if let result = matchClassId(str) {
let (attr, text) = (substringWithRangeAtIndex(result, str: str, at: 1),
substringWithRangeAtIndex(result, str: str, at: 2))
if skip {
Expand All @@ -177,7 +179,7 @@ private func getClassId(inout str: String, skip: Bool = true) -> String? {
}

private func getAttribute(inout str: String, skip: Bool = true) -> String? {
if let result = matchAttr2(str: str) {
if let result = matchAttr2(str) {
let (attr, expr, text) = (substringWithRangeAtIndex(result, str: str, at: 1),
substringWithRangeAtIndex(result, str: str, at: 2),
substringWithRangeAtIndex(result, str: str, at: 3))
Expand All @@ -201,7 +203,7 @@ private func getAttribute(inout str: String, skip: Bool = true) -> String? {
default:
return "@\(attr) = '\(text)'"
}
} else if let result = matchAttr1(str: str) {
} else if let result = matchAttr1(str) {
let atr = substringWithRangeAtIndex(result, str: str, at: 1)
if skip {
str = str.substringFromIndex(str.startIndex.advancedBy(result.range.length))
Expand All @@ -213,7 +215,7 @@ private func getAttribute(inout str: String, skip: Bool = true) -> String? {
return nil
} else if let attr = getAttrNot(&str) {
return "not(\(attr))"
} else if let result = matchPseudo(str: str) {
} else if let result = matchPseudo(str) {
let one = substringWithRangeAtIndex(result, str: str, at: 1)
if skip {
str = str.substringFromIndex(str.startIndex.advancedBy(result.range.length))
Expand All @@ -239,7 +241,7 @@ private func getAttribute(inout str: String, skip: Bool = true) -> String? {
case "last-child":
return "count(following-sibling::*) = 0"
default:
if let sub = matchSubNthChild(str: one) {
if let sub = matchSubNthChild(one) {
let (nth, arg1) = (substringWithRangeAtIndex(sub, str: one, at: 1),
substringWithRangeAtIndex(sub, str: one, at: 2))

Expand All @@ -251,7 +253,7 @@ private func getAttribute(inout str: String, skip: Bool = true) -> String? {
} else {
return nthFunc(a: 0, b: Int(arg1)!)
}
} else if let sub = matchSubNthChildN(str: one) {
} else if let sub = matchSubNthChildN(one) {
let (nth, arg1, arg2) = (substringWithRangeAtIndex(sub, str: one, at: 1),
substringWithRangeAtIndex(sub, str: one, at: 2),
substringWithRangeAtIndex(sub, str: one, at: 3))
Expand All @@ -260,7 +262,7 @@ private func getAttribute(inout str: String, skip: Bool = true) -> String? {
let a: Int = (arg1 == "-") ? -1 : Int(arg1)!
let b: Int = (arg2.isEmpty) ? 0 : Int(arg2)!
return nthFunc(a: a, b: b)
} else if let sub = matchSubNthOfType(str: one) {
} else if let sub = matchSubNthOfType(one) {
let arg1 = substringWithRangeAtIndex(sub, str: one, at: 1)
if arg1 == "odd" {
return "(position() >= 1) and (((position()-1) mod 2) = 0)"
Expand All @@ -269,7 +271,7 @@ private func getAttribute(inout str: String, skip: Bool = true) -> String? {
} else {
return "position() = \(arg1)"
}
} else if let sub = matchSubContains(str: one) {
} else if let sub = matchSubContains(one) {
let text = substringWithRangeAtIndex(sub, str: one, at: 1)
return "contains(., '\(text)')"
} else {
Expand All @@ -281,15 +283,15 @@ private func getAttribute(inout str: String, skip: Bool = true) -> String? {
}

private func getAttrNot(inout str: String, skip: Bool = true) -> String? {
if let result = matchAttrN(str: str) {
if let result = matchAttrN(str) {
var one = substringWithRangeAtIndex(result, str: str, at: 1)
if skip {
str = str.substringFromIndex(str.startIndex.advancedBy(result.range.length))
}

if let attr = getAttribute(&one, skip: false) {
return attr
} else if let sub = matchElement(str: one) {
} else if let sub = matchElement(one) {
let elem = (one as NSString).substringWithRange(sub.rangeAtIndex(1))
return "self::\(elem)"
} else if let attr = getClassId(&one) {
Expand All @@ -300,7 +302,7 @@ private func getAttrNot(inout str: String, skip: Bool = true) -> String? {
}

private func genCombinator(inout str: String, skip: Bool = true) -> String? {
if let result = matchCombinator(str: str) {
if let result = matchCombinator(str) {
let one = substringWithRangeAtIndex(result, str: str, at: 1)
if skip {
str = str.substringFromIndex(str.startIndex.advancedBy(result.range.length))
Expand All @@ -314,7 +316,7 @@ private func genCombinator(inout str: String, skip: Bool = true) -> String? {
case "~":
return "/following-sibling::"
default:
if let _ = matchSubBlank(str: one) {
if let _ = matchSubBlank(one) {
return "//"
} else {
return " | //"
Expand Down
6 changes: 4 additions & 2 deletions Source/Kanna.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,9 +244,11 @@ extension XMLNodeSet: SequenceType {
public typealias Generator = AnyGenerator<XMLElement>
public func generate() -> Generator {
var index = 0
return anyGenerator {
return AnyGenerator {
if index < self.nodes.count {
return self.nodes[index++]
let n = self.nodes[index]
index += 1
return n
}
return nil
}
Expand Down
6 changes: 4 additions & 2 deletions Source/libxml/libxmlHTMLNode.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,15 @@ internal final class libxmlHTMLNode: XMLElement {


subscript(attributeName: String) -> String? {
for var attr = nodePtr.memory.properties; attr != nil; attr = attr.memory.next {
var attr = nodePtr.memory.properties
while attr != nil {
let mem = attr.memory
if let tagName = String.fromCString(UnsafePointer(mem.name)) {
if attributeName == tagName {
return libxmlGetNodeContent(mem.children)
}
}
attr = attr.memory.next
}
return nil
}
Expand Down Expand Up @@ -119,7 +121,7 @@ internal final class libxmlHTMLNode: XMLElement {

var nodes : [XMLElement] = []
let size = Int(nodeSet.memory.nodeNr)
for var i = 0; i < size; ++i {
for i in 0 ..< size {
let node: xmlNodePtr = nodeSet.memory.nodeTab[i]
let htmlNode = libxmlHTMLNode(docPtr: docPtr, node: node)
nodes.append(htmlNode)
Expand Down

0 comments on commit 4cd13be

Please sign in to comment.