fix #50

node.go

@@ -27,6 +27,8 @@ const (
 	CommentNode
 	// AttributeNode is an attribute of element.
 	AttributeNode
+	// NotationNode is a directive represents in document (for example, <!text...>).
+	NotationNode
 )
 
 type Attr struct {
@@ -157,6 +159,9 @@ func outputXML(b *strings.Builder, n *Node, preserveSpaces bool, config *outputC
 			b.WriteString("-->")
 		}
 		return
+	case NotationNode:
+		fmt.Fprintf(b, "<!%s>", n.Data)
+		return
 	case DeclarationNode:
 		b.WriteString("<?" + n.Data)
 	default:

node_test.go

@@ -634,3 +634,11 @@ func TestNodeLevel(t *testing.T) {
 	}
 
 }
+
+func TestDirectiveNode(t *testing.T) {
+	expected := `<!DOCTYPE people_list SYSTEM "example.dtd">`
+	n := &Node{Data: `DOCTYPE people_list SYSTEM "example.dtd"`, Type: NotationNode}
+	if v := n.OutputXML(true); expected != v {
+		t.Errorf(`expected "%s", obtained "%s"`, expected, v)
+	}
+}

parse.go

@@ -281,6 +281,17 @@ func (p *parser) parse() (*Node, error) {
 			}
 			p.prev = node
 		case xml.Directive:
+			node := &Node{Type: NotationNode, Data: string(tok), level: p.level}
+			if p.level == p.prev.level {
+				AddSibling(p.prev, node)
+			} else if p.level > p.prev.level {
+				AddChild(p.prev, node)
+			} else if p.level < p.prev.level {
+				for i := p.prev.level - p.level; i > 1; i-- {
+					p.prev = p.prev.Parent
+				}
+				AddSibling(p.prev.Parent, node)
+			}
 		}
 	}
 }

parse_test.go

@@ -623,3 +623,36 @@ func TestStreamParser_DefaultNamespace(t *testing.T) {
 	x = `<Object id="ObjectC">ObjectD</Object>`
 	testOutputXML(t, "third call result", x, n)
 }
+
+func TestDirective(t *testing.T) {
+	s := `<?xml version="1.0" encoding="UTF-8"?>
+	<!DOCTYPE Workspace>
+	<Workspace xmlns="http://www.qlcplus.org/Workspace" CurrentWindow="FixtureManager">
+	  <Creator>
+		<Name>Q Light Controller Plus</Name>
+		<Version>4.12.3</Version>
+	  </Creator>
+	</Workspace>`
+	doc, err := Parse(strings.NewReader(s))
+	if err != nil {
+		t.Fatal(err.Error())
+	}
+
+	top := doc.FirstChild
+	n := top.NextSibling.NextSibling
+	if n == nil {
+		t.Error("should be not nil, but got nil")
+		return
+	}
+	if v := n.Type; v != NotationNode {
+		t.Errorf("expected the node type is NotationNode, but got %d", v)
+	}
+	if expected, val := `<!DOCTYPE Workspace>`, n.OutputXML(true); expected != val {
+		t.Errorf("expected %s but got %s", expected, val)
+	}
+
+	list := Find(doc, `//*`)
+	if m := len(list); m != 4 {
+		t.Errorf("expected count is 4 but got %d", m)
+	}
+}

query.go

@@ -156,7 +156,7 @@ func (x *NodeNavigator) NodeType() xpath.NodeType {
 	switch x.curr.Type {
 	case CommentNode:
 		return xpath.CommentNode
-	case TextNode, CharDataNode:
+	case TextNode, CharDataNode, NotationNode:
 		return xpath.TextNode
 	case DeclarationNode, DocumentNode:
 		return xpath.RootNode