toString experiments + code formatting

5 files changed, 27 insertions, 6 deletions

diff --git a/sources/scala/List.scala b/sources/scala/List.scala
index 95fc2f0699..9c238eb5ae 100644
--- a/sources/scala/List.scala
+++ b/sources/scala/List.scala
@@ -281,9 +281,13 @@ trait List[+a] extends Seq[a] {
   */
   def mkString(start: String, sep: String, end: String): String =
     start +
-   (if (isEmpty) end
-   else if (tail.isEmpty) head.toString() + end
-   else head.toString().concat(sep).concat(tail.mkString("", sep, end)));
+   (if (isEmpty)
+       { end }
+   else
+       { if (tail.isEmpty)
+	   { head.toString() + end }
+	 else
+	   { head.toString().concat(sep).concat(tail.mkString("", sep, end)) }});
 
   override def toString() = mkString("List(", ",", ")");
 
diff --git a/sources/scala/Seq.scala b/sources/scala/Seq.scala
index da25a1307e..4a7f7ae5e6 100644
--- a/sources/scala/Seq.scala
+++ b/sources/scala/Seq.scala
@@ -10,5 +10,20 @@
 package scala;
 
 trait Seq[+A] with Function1[Int, A] with Iterable[A] {
+
     def length: Int;
+
+    override def toString() = {
+      def toString1( it:Iterator[ A ] ):String = {
+	if( it.hasNext ) {
+	  ",".concat( it.next.toString() )
+             .concat( toString1( it ) )
+	  } else ")";
+      }
+      val it = elements;
+      if( it.hasNext )
+	"Seq(" +  it.next.toString() + toString1( it ) ;
+      else
+	"Seq()"
+      }
 }
diff --git a/sources/scala/SeqTrace.scala b/sources/scala/SeqTrace.scala
index 80cdfc58cd..bf4abf8649 100644
--- a/sources/scala/SeqTrace.scala
+++ b/sources/scala/SeqTrace.scala
@@ -31,6 +31,7 @@ package scala;
                    SeqTraceCons[a](state, value, this as SeqTrace[ a ] );
 
       // this is copied verbatim from List... and SeqList
+/*
 	 def mkString2(start: java.lang.String,
 		     sep: java.lang.String,
 		     end: java.lang.String): java.lang.String =
@@ -39,6 +40,7 @@ package scala;
 			 else if (tail.isEmpty) head.toString() + end
 			       else head.toString().concat(sep).concat(
 				             tail.mkString2("", sep, end)));
+*/
 /* BUG
 override def mkString(start: java.lang.String,
 		     sep: java.lang.String,
diff --git a/sources/scala/SeqTraceCons.scala b/sources/scala/SeqTraceCons.scala
index 4b5724d8fe..1ed1f6ec54 100644
--- a/sources/scala/SeqTraceCons.scala
+++ b/sources/scala/SeqTraceCons.scala
@@ -13,9 +13,9 @@ package scala;
 
 	  def headElem  = hdb;
 
-	  def tail = tl;
+	  def tail:SeqTrace[ b ] = tl;
 
-	  override def toString(): String = mkString2("[ ", "; ", " ]");
+	  //override def toString(): String = mkString2("[ ", "; ", " ]");
 
     }
 
diff --git a/sources/scala/SeqTraceNil.scala b/sources/scala/SeqTraceNil.scala
index 56269ecd5b..f8117e58d8 100644
--- a/sources/scala/SeqTraceNil.scala
+++ b/sources/scala/SeqTraceNil.scala
@@ -16,7 +16,7 @@ package scala ;
 
 	  def tail: SeqTraceNil[c] = error("tail of empty Trace");
 
-	  override def toString(): String = "[]";
+	  //override def toString(): String = "[]";
 
     }