summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2007-11-19 17:43:28 +0000
committermichelou <michelou@epfl.ch>2007-11-19 17:43:28 +0000
commitafbc3fedec87317ef8075e7905a7575097a4cd84 (patch)
tree7edc187da37007edbb8d5df903e14a8b41db6cb5 /src
parent1c3653233e48b93a32efacf00517a6738e0969bc (diff)
downloadscala-afbc3fedec87317ef8075e7905a7575097a4cd84.tar.gz
scala-afbc3fedec87317ef8075e7905a7575097a4cd84.tar.bz2
scala-afbc3fedec87317ef8075e7905a7575097a4cd84.zip
reenabled actor exit in partest
Diffstat (limited to 'src')
-rw-r--r--src/cldc-library/scala/compat/StringBuilder.scala8
-rw-r--r--src/library/scala/compat/StringBuilder.scala3
-rw-r--r--src/partest/scala/tools/partest/MasterActor.scala2
3 files changed, 7 insertions, 6 deletions
diff --git a/src/cldc-library/scala/compat/StringBuilder.scala b/src/cldc-library/scala/compat/StringBuilder.scala
index cdd7026829..e3416ac497 100644
--- a/src/cldc-library/scala/compat/StringBuilder.scala
+++ b/src/cldc-library/scala/compat/StringBuilder.scala
@@ -15,8 +15,8 @@ package scala.compat
import java.lang.{String, StringBuffer}
-/** Consult the documentation of java.lang.StringBuffer for more details
- * (see http://java.sun.com/javame/reference/apis/jsr030/).
+/** Consult the documentation of <code>java.lang.StringBuffer</code> for more
+ * details (see http://java.sun.com/javame/reference/apis/jsr030/).
*/
final class StringBuilder(val self: StringBuffer) extends (Int => Char) with Proxy {
@@ -63,7 +63,7 @@ final class StringBuilder(val self: StringBuffer) extends (Int => Char) with Pro
def insert(at: Int, x: Long): StringBuilder = { self.insert(at, x); this }
def insert(at: Int, x: String): StringBuilder = { self.insert(at, x); this }
def insert(at: Int, x: Array[Char]): StringBuilder = { self.insert(at, x); this }
- //def insert(at: Int, x: Array[Char], start: Int, length: Int): StringBuilder =
- // { self.insert(at, x, start, length); this }
+ def insert(at: Int, x: Array[Char], start: Int, length: Int): StringBuilder =
+ { self.insert(at, x.slice(start, length)); this }
}
diff --git a/src/library/scala/compat/StringBuilder.scala b/src/library/scala/compat/StringBuilder.scala
index 7345153f12..abedc99041 100644
--- a/src/library/scala/compat/StringBuilder.scala
+++ b/src/library/scala/compat/StringBuilder.scala
@@ -15,7 +15,8 @@ package scala.compat
import java.lang.{String, StringBuffer}
-/** Consult the documentation of java.lang.StringBuffer for more details
+/** Consult the documentation of <code>java.lang.StringBuffer</code> for more
+ * details (see http://java.sun.com/javase/6/docs/api/).
*/
final class StringBuilder(val self: StringBuffer) extends (Int => Char) with Proxy {
diff --git a/src/partest/scala/tools/partest/MasterActor.scala b/src/partest/scala/tools/partest/MasterActor.scala
index 6f385110ed..600d1dad4f 100644
--- a/src/partest/scala/tools/partest/MasterActor.scala
+++ b/src/partest/scala/tools/partest/MasterActor.scala
@@ -143,7 +143,7 @@ class MasterActor(testDir: File, out: PrintStream) extends Actor {
out.println(counter - failed)
out.close
println
- System.exit(1) //exit // Help! Philipp.
+ exit
}
case msg =>