[svn] r6190: nemerle/trunk/lib: hashtable.n tree.n

[nazgul]

Log:
Add braces to string output also to Nemerle.Collections.Map

Author: nazgul
Date: Tue Apr 11 20:39:36 2006
New Revision: 6190

Modified:
   nemerle/trunk/lib/hashtable.n
   nemerle/trunk/lib/tree.n

Modified: nemerle/trunk/lib/hashtable.n
==============================================================================
--- nemerle/trunk/lib/hashtable.n	(original)
+++ nemerle/trunk/lib/hashtable.n	Tue Apr 11 20:39:36 2006
@@ -199,9 +199,7 @@
       }
     }
     
-    public override ToString () : string
-    {
-      def better_to_string (x : object) {
+    internal static better_to_string (x : object) : string {
         match (x) {
           | str is string => "\"" + str + "\""
           | ch is char => "'" + ch.ToString () + "'"
@@ -209,6 +207,8 @@
         }
       }
       
+    public override ToString () : string
+    {
       def sb = System.Text.StringBuilder ("{");
       foreach (x in this) {
         _ = sb.Append (better_to_string (x.Key));

Modified: nemerle/trunk/lib/tree.n
==============================================================================
--- nemerle/trunk/lib/tree.n	(original)
+++ nemerle/trunk/lib/tree.n	Tue Apr 11 20:39:36 2006
@@ -665,6 +665,16 @@
       this
     }
 
+    public override ToString () : string 
+    {
+      def sb = System.Text.StringBuilder ("{");
+      _ = Tree.Fold (root, sb, fun (n, sb) { 
+        sb.Append (Hashtable.better_to_string (n.key)).Append (": ").Append (Hashtable.better_to_string (n.val)).Append (", ")
+      });
+      when (sb.Length > 1)
+        sb.Length = sb.Length - 2;
+      sb.Append ("}").ToString ()
+    }
 
     public First () : 'b  
     {
@@ -679,10 +689,7 @@
     {
       get
       {
-        match (root) {
-          | Tree.Node.Leaf => true
-          | _ => false
-        }
+        size == 0
       }
     }