aboutsummaryrefslogtreecommitdiff
path: root/src/encoding/xml/xml.go
diff options
context:
space:
mode:
Diffstat (limited to 'src/encoding/xml/xml.go')
-rw-r--r--src/encoding/xml/xml.go43
1 files changed, 5 insertions, 38 deletions
diff --git a/src/encoding/xml/xml.go b/src/encoding/xml/xml.go
index ffab4a70c9..0a21c93053 100644
--- a/src/encoding/xml/xml.go
+++ b/src/encoding/xml/xml.go
@@ -35,24 +35,15 @@ func (e *SyntaxError) Error() string {
return "XML syntax error on line " + strconv.Itoa(e.Line) + ": " + e.Msg
}
-// A Name represents an XML name (Local) annotated with a name space
-// identifier (Space). In tokens returned by Decoder.Token, the Space
-// identifier is given as a canonical URL, not the short prefix used in
-// the document being parsed.
-//
-// As a special case, XML namespace declarations will use the literal
-// string "xmlns" for the Space field instead of the fully resolved URL.
-// See Encoder.EncodeToken for more information on namespace encoding
-// behaviour.
+// A Name represents an XML name (Local) annotated
+// with a name space identifier (Space).
+// In tokens returned by Decoder.Token, the Space identifier
+// is given as a canonical URL, not the short prefix used
+// in the document being parsed.
type Name struct {
Space, Local string
}
-// isNamespace reports whether the name is a namespace-defining name.
-func (name Name) isNamespace() bool {
- return name.Local == "xmlns" || name.Space == "xmlns"
-}
-
// An Attr represents an attribute in an XML element (Name=Value).
type Attr struct {
Name Name
@@ -81,30 +72,6 @@ func (e StartElement) End() EndElement {
return EndElement{e.Name}
}
-// setDefaultNamespace sets the namespace of the element
-// as the default for all elements contained within it.
-func (e *StartElement) setDefaultNamespace() {
- if e.Name.Space == "" {
- // If there's no namespace on the element, don't
- // set the default. Strictly speaking this might be wrong, as
- // we can't tell if the element had no namespace set
- // or was just using the default namespace.
- return
- }
- // Don't add a default name space if there's already one set.
- for _, attr := range e.Attr {
- if attr.Name.Space == "" && attr.Name.Local == "xmlns" {
- return
- }
- }
- e.Attr = append(e.Attr, Attr{
- Name: Name{
- Local: "xmlns",
- },
- Value: e.Name.Space,
- })
-}
-
// An EndElement represents an XML end element.
type EndElement struct {
Name Name