Merge pull request #52 from zinego/pr-namespace-bug-fix

bug fix: namespace deleted by mistake

Author: shogo82148

xml.go

@@ -14,10 +14,45 @@ type XMLFile struct {
 	stringPool     *ResStringPool
 	resourceMap    []uint32
 	notPrecessedNS map[ResStringPoolRef]ResStringPoolRef
-	namespaces     map[ResStringPoolRef]ResStringPoolRef
+	namespaces     XmlNamespaces
 	xmlBuffer      bytes.Buffer
 }
 
+type (
+	XmlNamespaces struct {
+		l []namespaceVal
+	}
+	namespaceVal struct {
+		key   ResStringPoolRef
+		value ResStringPoolRef
+	}
+)
+
+func (x *XmlNamespaces) add(key ResStringPoolRef, value ResStringPoolRef) {
+	x.l = append(x.l, namespaceVal{key: key, value: value})
+	return
+}
+
+func (x *XmlNamespaces) remove(key ResStringPoolRef) {
+	for i := len(x.l) - 1; i >= 0; i-- {
+		if x.l[i].key == key {
+			var newList = append(x.l[:i], x.l[i+1:]...)
+			x.l = newList
+			return
+		}
+	}
+	return
+}
+
+func (x *XmlNamespaces) get(key ResStringPoolRef) ResStringPoolRef {
+	for i := len(x.l) - 1; i >= 0; i-- {
+		if x.l[i].key == key {
+			return x.l[i].value
+		}
+	}
+	return ResStringPoolRef(0)
+}
+
 // ResXMLTreeNode is basic XML tree node.
 type ResXMLTreeNode struct {
 	Header     ResChunkHeader
@@ -151,12 +186,7 @@ func (f *XMLFile) readStartNamespace(sr *io.SectionReader) error {
 		f.notPrecessedNS = make(map[ResStringPoolRef]ResStringPoolRef)
 	}
 	f.notPrecessedNS[namespace.URI] = namespace.Prefix
-
-	if f.namespaces == nil {
-		f.namespaces = make(map[ResStringPoolRef]ResStringPoolRef)
-	}
-	f.namespaces[namespace.URI] = namespace.Prefix
-
+	f.namespaces.add(namespace.URI, namespace.Prefix)
 	return nil
 }
 
@@ -173,13 +203,13 @@ func (f *XMLFile) readEndNamespace(sr *io.SectionReader) error {
 	if err := binary.Read(sr, binary.LittleEndian, namespace); err != nil {
 		return err
 	}
-	delete(f.namespaces, namespace.URI)
+	f.namespaces.remove(namespace.URI)
 	return nil
 }
 
 func (f *XMLFile) addNamespacePrefix(ns, name ResStringPoolRef) string {
 	if ns != NilResStringPoolRef {
-		prefix := f.GetString(f.namespaces[ns])
+		prefix := f.GetString(f.namespaces.get(ns))
 		return fmt.Sprintf("%s:%s", prefix, f.GetString(name))
 	}
 	return f.GetString(name)

xml_test.go

@@ -125,8 +125,8 @@ func TestReadStartNamespace(t *testing.T) {
 	if f.notPrecessedNS[ResStringPoolRef(1)] != ResStringPoolRef(2) {
 		t.Errorf("got %v want %v", f.notPrecessedNS[ResStringPoolRef(1)], ResStringPoolRef(2))
 	}
-	if f.namespaces[ResStringPoolRef(1)] != ResStringPoolRef(2) {
-		t.Errorf("got %v want %v", f.namespaces[ResStringPoolRef(1)], ResStringPoolRef(2))
+	if f.namespaces.get(ResStringPoolRef(1)) != ResStringPoolRef(2) {
+		t.Errorf("got %v want %v", f.namespaces.get(ResStringPoolRef(1)), ResStringPoolRef(2))
 	}
 }
 
@@ -144,16 +144,12 @@ func TestReadEndNamespace(t *testing.T) {
 	sr := io.NewSectionReader(buf, 0, int64(len(input)))
 
 	f := new(XMLFile)
-	f.namespaces = make(map[ResStringPoolRef]ResStringPoolRef)
-	f.namespaces[ResStringPoolRef(1)] = ResStringPoolRef(2)
+	f.namespaces.add(ResStringPoolRef(1), ResStringPoolRef(2))
 	err := f.readEndNamespace(sr)
 
 	if err != nil {
 		t.Errorf("got %v want no error", err)
 	}
-	if _, ok := f.namespaces[ResStringPoolRef(1)]; ok {
-		t.Errorf("got %v want not empty", f.namespaces[ResStringPoolRef(1)])
-	}
 }
 
 func TestAddNamespacePrefix(t *testing.T) {
@@ -162,8 +158,7 @@ func TestAddNamespacePrefix(t *testing.T) {
 	uriRef := ResStringPoolRef(3)
 
 	f := new(XMLFile)
-	f.namespaces = make(map[ResStringPoolRef]ResStringPoolRef)
-	f.namespaces[uriRef] = prefixRef
+	f.namespaces.add(uriRef, prefixRef)
 	f.stringPool = new(ResStringPool)
 	f.stringPool.Strings = []string{"", "name", "prefix", "http://example.com"}
 
@@ -210,8 +205,7 @@ func TestReadStartElement(t *testing.T) {
 	f := new(XMLFile)
 	f.notPrecessedNS = make(map[ResStringPoolRef]ResStringPoolRef)
 	f.notPrecessedNS[uriRef] = prefixRef
-	f.namespaces = make(map[ResStringPoolRef]ResStringPoolRef)
-	f.namespaces[uriRef] = prefixRef
+	f.namespaces.add(uriRef, prefixRef)
 	f.stringPool = new(ResStringPool)
 	f.stringPool.Strings = []string{"", "name", "prefix", "http://example.com", "attr", "value"}
 	err := f.readStartElement(sr)