From d868626d911092b18ef59ed794bfeca4e917a498 Mon Sep 17 00:00:00 2001
From: kohait <kohait@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sun, 4 Sep 2011 09:28:07 +0000
Subject: [PATCH] bazaar: Tree fixes

git-svn-id: svn://ultimatepp.org/upp/trunk@3813 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 bazaar/Tree/Tree.h | 63 ++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 58 insertions(+), 5 deletions(-)

diff --git a/bazaar/Tree/Tree.h b/bazaar/Tree/Tree.h
index b0914ef16..186440cd4 100644
--- a/bazaar/Tree/Tree.h
+++ b/bazaar/Tree/Tree.h
@@ -129,7 +129,7 @@ class Node
 	: public Tree<Node<T> >
 {
 public:
-	typedef Node CLASSNAME;
+	typedef Node<T> CLASSNAME;
 	typedef Tree<Node<T> > R;
 
 	Node() {}
@@ -317,13 +317,26 @@ public:
 	friend void     Swap(TreeMap& a, TreeMap& b)   { a.B::Swap(b); for(int i = 0; i < a.GetCount(); i++) DoLink(a[i]); for(int i = 0; i < b.GetCount(); i++) b.DoLink(b[i]); }
 };
 
-template<class K, class T>
+NAMESPACE_UPP
+template<class K, class T, class H>
+inline void Xmlize(XmlIO xml, TreeMap<K, T, H>& data)
+{
+	::Xmlize(xml, (ArrayMap<K, T, H>&)data);
+}
+
+template <class K, class T, class H>
+inline void DumpContainer(Stream& s, const TreeMap<K, T, H>& c) {
+	DumpContainer(s, c.Begin(), c.End());
+}
+END_UPP_NAMESPACE
+
+template<class K, class T, class H = StdHash<K> >
 class MapNode
-	: public TreeMap<K, MapNode<K,T> >
+	: public TreeMap<K, MapNode<K,T,H>, H>
 {
 public:
-	typedef MapNode CLASSNAME;
-	typedef TreeMap<K, MapNode<K,T> > R;
+	typedef MapNode<K, T, H> CLASSNAME;
+	typedef TreeMap<K, MapNode<K,T,H>, H> R;
 
 	MapNode() {}
 	MapNode(const T& leaf) : leaf(leaf) {}
@@ -331,4 +344,44 @@ public:
 	T leaf;
 };
 
+NAMESPACE_UPP
+template <class K, class T, class H>
+inline Stream& operator%(Stream& s, MapNode<K, T, H>& x)
+{
+	s % x.leaf % (TreeMap<K, MapNode<K,T,H>, H>&)x;
+	return s;
+}
+
+template<class K, class T, class H>
+inline void Xmlize(XmlIO xml, MapNode<K, T, H>& a)
+{
+	xml("leaf", a.leaf); ::Xmlize(xml, (TreeMap<K, MapNode<K,T,H>, H>&)a);
+}
+END_UPP_NAMESPACE
+
+template<class K, class BB, class H = StdHash<K> > //B conflicts with Tree::B
+class MapNodeB
+	: public TreeMap<K, MapNodeB<K, BB, H>, H>
+	, public BB //leaf
+{
+public:
+	typedef MapNodeB<K, BB, H> CLASSNAME;
+	typedef TreeMap<MapNodeB<K,BB,H>, H> R;
+};
+
+NAMESPACE_UPP
+template <class K, class BB, class H>
+inline Stream& operator%(Stream& s, MapNodeB<K, BB, H>& x)
+{
+	s % (BB&)x % (TreeMap<K, MapNodeB<K,BB,H>, H>&)x;
+	return s;
+}
+
+template<class K, class BB, class H>
+inline void Xmlize(XmlIO xml, MapNodeB<K, BB, H>& a)
+{
+	xml("leaf", (BB&)a); ::Xmlize(xml, (TreeMap<K, MapNodeB<K,BB,H>, H>&)a);
+}
+END_UPP_NAMESPACE
+
 #endif