Fix the prefix when namespace processing is disabled.

Brian King · Brian King · commit 377daa99ee89 · 2016-10-28T00:24:40.000-04:00
diff --git a/Foundation/NSXMLParser.swift b/Foundation/NSXMLParser.swift
@@ -319,7 +319,7 @@ internal func _NSXMLParserStartElementNs(_ ctx: _CFXMLInterface, localname: Unsa
         
     }
 
-    let elementName: String = UTF8STRING(localname)!
+    var elementName: String = UTF8STRING(localname)!
     var namespaceURI: String? = nil
     var qualifiedName: String? = nil
     if parser.shouldProcessNamespaces {
@@ -329,14 +329,17 @@ internal func _NSXMLParserStartElementNs(_ ctx: _CFXMLInterface, localname: Unsa
             qualifiedName = elementName + ":" + prefix
         }
     }
+    else if let prefix = UTF8STRING(prefix) {
+        elementName = elementName + ":" + prefix
+    }
 
     parser.delegate?.parser(parser, didStartElement: elementName, namespaceURI: namespaceURI, qualifiedName: qualifiedName, attributes: attrDict)
 }
 
 internal func _NSXMLParserEndElementNs(_ ctx: _CFXMLInterface , localname: UnsafePointer<UInt8>, prefix: UnsafePointer<UInt8>?, URI: UnsafePointer<UInt8>?) -> Void {
     let parser = ctx.parser
 
-    let elementName: String = UTF8STRING(localname)!
+    var elementName: String = UTF8STRING(localname)!
     var namespaceURI: String? = nil
     var qualifiedName: String? = nil
     if parser.shouldProcessNamespaces {
@@ -346,6 +349,9 @@ internal func _NSXMLParserEndElementNs(_ ctx: _CFXMLInterface , localname: Unsaf
             qualifiedName = elementName + ":" + prefix
         }
     }
+    else if let prefix = UTF8STRING(prefix) {
+        elementName = elementName + ":" + prefix
+    }
 
     parser.delegate?.parser(parser, didEndElement: elementName, namespaceURI: namespaceURI, qualifiedName: qualifiedName)
 

Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ internal func _NSXMLParserStartElementNs(_ ctx: _CFXMLInterface, localname: Unsa`
`319`	`319`
`320`	`320`	`}`
`321`	`321`
`322`		`- let elementName: String = UTF8STRING(localname)!`
	`322`	`+ var elementName: String = UTF8STRING(localname)!`
`323`	`323`	`var namespaceURI: String? = nil`
`324`	`324`	`var qualifiedName: String? = nil`
`325`	`325`	`if parser.shouldProcessNamespaces {`
`@@ -329,14 +329,17 @@ internal func _NSXMLParserStartElementNs(_ ctx: _CFXMLInterface, localname: Unsa`
`329`	`329`	`qualifiedName = elementName + ":" + prefix`
`330`	`330`	`}`
`331`	`331`	`}`
	`332`	`+ else if let prefix = UTF8STRING(prefix) {`
	`333`	`+ elementName = elementName + ":" + prefix`
	`334`	`+ }`
`332`	`335`
`333`	`336`	`parser.delegate?.parser(parser, didStartElement: elementName, namespaceURI: namespaceURI, qualifiedName: qualifiedName, attributes: attrDict)`
`334`	`337`	`}`
`335`	`338`
`336`	`339`	`internal func _NSXMLParserEndElementNs(_ ctx: _CFXMLInterface , localname: UnsafePointer<UInt8>, prefix: UnsafePointer<UInt8>?, URI: UnsafePointer<UInt8>?) -> Void {`
`337`	`340`	`let parser = ctx.parser`
`338`	`341`
`339`		`- let elementName: String = UTF8STRING(localname)!`
	`342`	`+ var elementName: String = UTF8STRING(localname)!`
`340`	`343`	`var namespaceURI: String? = nil`
`341`	`344`	`var qualifiedName: String? = nil`
`342`	`345`	`if parser.shouldProcessNamespaces {`
`@@ -346,6 +349,9 @@ internal func _NSXMLParserEndElementNs(_ ctx: _CFXMLInterface , localname: Unsaf`
`346`	`349`	`qualifiedName = elementName + ":" + prefix`
`347`	`350`	`}`
`348`	`351`	`}`
	`352`	`+ else if let prefix = UTF8STRING(prefix) {`
	`353`	`+ elementName = elementName + ":" + prefix`
	`354`	`+ }`
`349`	`355`
`350`	`356`	`parser.delegate?.parser(parser, didEndElement: elementName, namespaceURI: namespaceURI, qualifiedName: qualifiedName)`
`351`	`357`