Merge pull request #86 from thomas-em/tm/swift-3

Fixes to make SWXMLHash work with Swift 3 of current Xcode 8 beta 2 (8S162m)
drmohundro · Jul 15, 2016 · 89fafda · 89fafda
2 parents e56067f + d1a6bcf
commit 89fafda
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/SWXMLHashPlayground.playground/section-1.swift b/SWXMLHashPlayground.playground/section-1.swift
@@ -78,7 +78,7 @@ struct Book: XMLIndexerDeserializable {
     let year: Int
     let amount: Int?
 
-    static func deserialize(node: XMLIndexer) throws -> Book {
+    static func deserialize(_ node: XMLIndexer) throws -> Book {
         return try Book(
             title: node["title"].value(),
             price: node["price"].value(),

diff --git a/Source/SWXMLHash.swift b/Source/SWXMLHash.swift
@@ -187,7 +187,7 @@ class LazyXMLParser: NSObject, SimpleXmlParser, XMLParserDelegate {
         parser.parse()
     }
 
-    private func parser(_ parser: XMLParser,
+    func parser(_ parser: Foundation.XMLParser,
                 didStartElement elementName: String,
                 namespaceURI: String?,
                 qualifiedName qName: String?,
@@ -202,7 +202,7 @@ class LazyXMLParser: NSObject, SimpleXmlParser, XMLParserDelegate {
         parentStack.push(currentNode)
     }
 
-    private func parser(_ parser: XMLParser, foundCharacters string: String) {
+    func parser(_ parser: Foundation.XMLParser, foundCharacters string: String) {
         if !onMatch() {
             return
         }
@@ -212,17 +212,17 @@ class LazyXMLParser: NSObject, SimpleXmlParser, XMLParserDelegate {
         current.addText(string)
     }
 
-    private func parser(_ parser: XMLParser,
+    func parser(_ parser: Foundation.XMLParser,
                 didEndElement elementName: String,
                 namespaceURI: String?,
                 qualifiedName qName: String?) {
 
         let match = onMatch()
 
-        elementStack.pop()
+        let _ = elementStack.pop()
 
         if match {
-            parentStack.pop()
+            let _ = parentStack.pop()
         }
     }
 
@@ -263,7 +263,7 @@ class XMLParser: NSObject, SimpleXmlParser, XMLParserDelegate {
         return XMLIndexer(root)
     }
 
-    private func parser(_ parser: XMLParser,
+    func parser(_ parser: Foundation.XMLParser,
                 didStartElement elementName: String,
                 namespaceURI: String?,
                 qualifiedName qName: String?,
@@ -273,18 +273,18 @@ class XMLParser: NSObject, SimpleXmlParser, XMLParserDelegate {
         parentStack.push(currentNode)
     }
 
-    private func parser(_ parser: XMLParser, foundCharacters string: String) {
+    func parser(_ parser: Foundation.XMLParser, foundCharacters string: String) {
         let current = parentStack.top()
 
         current.addText(string)
     }
 
-    private func parser(_ parser: XMLParser,
+    func parser(_ parser: Foundation.XMLParser,
                 didEndElement elementName: String,
                 namespaceURI: String?,
                 qualifiedName qName: String?) {
 
-        parentStack.pop()
+        let _ = parentStack.pop()
     }
 }
 

diff --git a/Tests/TypeConversionBasicTypesTests.swift b/Tests/TypeConversionBasicTypesTests.swift
@@ -302,7 +302,7 @@ struct BasicItem: XMLIndexerDeserializable {
     let name: String
     let price: Double
 
-    static func deserialize(node: XMLIndexer) throws -> BasicItem {
+    static func deserialize(_ node: XMLIndexer) throws -> BasicItem {
         return try BasicItem(
             name: node["name"].value(),
             price: node["price"].value()

diff --git a/Tests/TypeConversionComplexTypesTests.swift b/Tests/TypeConversionComplexTypesTests.swift
@@ -113,7 +113,7 @@ struct ComplexItem: XMLIndexerDeserializable {
     let priceOptional: Double?
     let basics: [BasicItem]
 
-    static func deserialize(node: XMLIndexer) throws -> ComplexItem {
+    static func deserialize(_ node: XMLIndexer) throws -> ComplexItem {
         return try ComplexItem(
             name: node["name"].value(),
             priceOptional: node["price"].value(),

diff --git a/Tests/XMLParsingTests.swift b/Tests/XMLParsingTests.swift
@@ -132,7 +132,7 @@ class XMLParsingTests: XCTestCase {
             XCTAssertNotNil(err)
         }
         do {
-            try xml!.byKey("root").byKey("what").byKey("header").byKey("foo")
+            let _ = try xml!.byKey("root").byKey("what").byKey("header").byKey("foo")
         } catch let error as XMLIndexer.Error {
             err = error
         } catch { err = nil }
@@ -144,7 +144,7 @@ class XMLParsingTests: XCTestCase {
             XCTAssertNotNil(err)
         }
         do {
-            try xml!.byKey("what").byKey("subelement").byIndex(5).byKey("nomatch")
+            let _ = try xml!.byKey("what").byKey("subelement").byIndex(5).byKey("nomatch")
         } catch let error as XMLIndexer.Error {
             err = error
         } catch { err = nil }