Made XmlElement.text non-optional.

BiAtoms · Oct 28, 2017 · 60a7d4f · 60a7d4f
1 parent 2e278fa
commit 60a7d4f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/Sources/XmlElement.swift b/Sources/XmlElement.swift
@@ -11,7 +11,7 @@ import Foundation
 open class XmlElement {
     open var name: String
     open var attributes: [String:String] = [:]
-    open var text: String?
+    open var text: String = "" //I guess this is ok.
     open var children: [XmlElement] = []
     open var parent: XmlElement?
 
@@ -24,7 +24,7 @@ open class XmlElement {
 
     open var xml: String {
         //TODO: generate compact xml
-        return "<\(name)\(attributes.map({" \($0)=\"\($1)\" "}).joined())>\(text ?? "")\(children.map({ $0.description }).joined())</\(name)>"
+        return "<\(name)\(attributes.map({" \($0)=\"\($1)\" "}).joined())>\(text)\(children.map({ $0.description }).joined())</\(name)>"
     }
 }
 

diff --git a/Sources/XmlParser.swift b/Sources/XmlParser.swift
@@ -51,16 +51,12 @@ extension XmlParser: XMLParserDelegate {
     }
 
     public func parser(_ parser: XMLParser, foundCharacters string: String) {
-        if currentElement.text == nil {
-            currentElement.text = string
-        } else {
-            currentElement.text! += string
-        }
+        currentElement.text += string
     }
 
     public func parser(_ parser: XMLParser, didEndElement elementName: String, namespaceURI: String?, qualifiedName qName: String?) {
         assert(currentElement.name == elementName, "This should not ever happen")
-        currentElement.text = currentElement.text?.trimmingCharacters(in: .whitespacesAndNewlines)
+        currentElement.text = currentElement.text.trimmingCharacters(in: .whitespacesAndNewlines)
         currentElement = currentElement.parent
         self.delegate?.parser(self, didEndElement: elementName)
     }