summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorPhilipp Haller <hallerp@gmail.com>2007-07-10 13:18:33 +0000
committerPhilipp Haller <hallerp@gmail.com>2007-07-10 13:18:33 +0000
commit01d6a088daf681a89fcf6443039fba3d02f6c999 (patch)
treebd511fd203e4e9837fae6e3989b332b106773c99 /src/library
parentab51bb3e068c61cf32aaf13b29fc923e9840e062 (diff)
downloadscala-01d6a088daf681a89fcf6443039fba3d02f6c999.tar.gz
scala-01d6a088daf681a89fcf6443039fba3d02f6c999.tar.bz2
scala-01d6a088daf681a89fcf6443039fba3d02f6c999.zip
Removed deprecated classes Actor, NameServer, P...
Removed deprecated classes Actor, NameServer, Pid, and Process.
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/concurrent/Actor.scala46
-rw-r--r--src/library/scala/concurrent/NameServer.scala48
-rw-r--r--src/library/scala/concurrent/Pid.scala50
-rw-r--r--src/library/scala/concurrent/Process.scala97
4 files changed, 0 insertions, 241 deletions
diff --git a/src/library/scala/concurrent/Actor.scala b/src/library/scala/concurrent/Actor.scala
deleted file mode 100644
index a4d0bac02c..0000000000
--- a/src/library/scala/concurrent/Actor.scala
+++ /dev/null
@@ -1,46 +0,0 @@
-/* __ *\
-** ________ ___ / / ___ Scala API **
-** / __/ __// _ | / / / _ | (c) 2003-2007, LAMP/EPFL **
-** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
-** /____/\___/_/ |_/____/_/ | | **
-** |/ **
-\* */
-
-// $Id$
-
-
-package scala.concurrent
-
-import java.lang.Thread
-
-/**
- * The class <code>Actor</code> ...
- *
- * @author Martin Odersky
- * @version 1.0
- * @deprecated use scala.actors package instead
- */
-@deprecated
-abstract class Actor extends Thread {
- private val in = new MailBox
-
- def send(msg: in.Message) =
- in.send(msg)
-
- def receive[A](f: PartialFunction[in.Message, A]): A =
- if (currentThread == this) in.receive(f)
- else throw new IllegalArgumentException("receive called not on own process")
-
- def receiveWithin[A](msec: Long)(f: PartialFunction[in.Message, A]): A =
- if (currentThread == this) in.receiveWithin(msec)(f)
- else throw new IllegalArgumentException("receiveWithin called not on own process")
-
- private var pid: Pid = null
-
- def self = {
- if (pid eq null) pid = new Pid(this)
- pid
- }
-
- def self_= (p: Pid) = pid = p
-}
diff --git a/src/library/scala/concurrent/NameServer.scala b/src/library/scala/concurrent/NameServer.scala
deleted file mode 100644
index 135c73862d..0000000000
--- a/src/library/scala/concurrent/NameServer.scala
+++ /dev/null
@@ -1,48 +0,0 @@
-/* __ *\
-** ________ ___ / / ___ Scala API **
-** / __/ __// _ | / / / _ | (c) 2003-2007, LAMP/EPFL **
-** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
-** /____/\___/_/ |_/____/_/ | | **
-** |/ **
-\* */
-
-// $Id$
-
-
-package scala.concurrent
-
-
-/**
- * @author Erik Stenman
- * @version 1.0, 01/10/2003
- * @deprecated use scala.actors package instead
- */
-@deprecated
-object NameServer {
-
- val names = new scala.collection.mutable.HashMap[Symbol, Process]
-
- /**
- * @param name ...
- * @param proc ...
- */
- def register(name: Symbol, proc: Process) = {
- if (names contains name) throw new IllegalArgumentException("Name:" + name + " already registred")
- names += name -> proc
- }
-
- def unregister(name: Symbol) =
- if (names contains name) names -= name
- else throw new IllegalArgumentException("Name:" + name + " not registred")
-
- /**
- * @param name ...
- * @return ...
- */
- def whereis(name: Symbol): Option[Process] =
- names.get(name)
-
- def send(name: Symbol, msg: MailBox#Message) =
- names(name).send(msg)
-
-}
diff --git a/src/library/scala/concurrent/Pid.scala b/src/library/scala/concurrent/Pid.scala
deleted file mode 100644
index 0c1aa98f2d..0000000000
--- a/src/library/scala/concurrent/Pid.scala
+++ /dev/null
@@ -1,50 +0,0 @@
-/* __ *\
-** ________ ___ / / ___ Scala API **
-** / __/ __// _ | / / / _ | (c) 2003-2007, LAMP/EPFL **
-** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
-** /____/\___/_/ |_/____/_/ | | **
-** |/ **
-\* */
-
-// $Id$
-
-
-package scala.concurrent
-
-/**
- * The class <code>Pid</code> provides process identifiers
- * to thread-based actors.
- *
- * @author Philipp Haller
- * @version 1.0
- * @deprecated use scala.actors package instead
- */
-@deprecated
-class Pid(actor: Actor) {
- private var target = actor
-
- def !(msg: MailBox#Message) = target send msg
-
- def spawn(body: Actor => Unit): Pid = {
- val a = new Actor {
- override def run: Unit = body(this)
- }
- a.start
- a.self
- }
-
- def spawnReceive(cases: PartialFunction[MailBox#Message, Unit]) = {
- val a = new Actor {
- override def run: Unit = receive(cases)
- }
- a.start
- a.self
- }
-
- override def hashCode() = target.hashCode()
-
- override def equals(that: Any) =
- this.hashCode() == that.hashCode()
-
- override def toString() = "Pid(" + target + ")"
-}
diff --git a/src/library/scala/concurrent/Process.scala b/src/library/scala/concurrent/Process.scala
deleted file mode 100644
index eaf572c316..0000000000
--- a/src/library/scala/concurrent/Process.scala
+++ /dev/null
@@ -1,97 +0,0 @@
-/* __ *\
-** ________ ___ / / ___ Scala API **
-** / __/ __// _ | / / / _ | (c) 2003-2007, LAMP/EPFL **
-** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
-** /____/\___/_/ |_/____/_/ | | **
-** |/ **
-\* */
-
-// $Id$
-
-
-package scala.concurrent
-
-
-/** This object ...
- *
- * @author Erik Stenman
- * @version 1.0, 01/10/2003
- *
- * @deprecated use <a href="../actors$content.html">scala.actors</a> package instead
- */
-@deprecated
-object Process {
-
- def spawn(body: => Unit): Process = {
- val p = new Process(body)
- p.start()
- p
- }
-
- def spawn_link(body: => Unit): Process =
- self.spawn_link(body)
-
- def send(p: Process, msg: MailBox#Message) =
- p.send(msg)
-
- def receive[A](f: PartialFunction[MailBox#Message, A]): A =
- self.receive(f)
-
- def receiveWithin[A](msec: Long)(f: PartialFunction[MailBox#Message, A]): A =
- self.receiveWithin(msec)(f)
-
- /**
- * @return the self process
- * @throws Predef.UnsupportedOperationException if self called outside a process.
- */
- def self: Process =
- if (currentThread.isInstanceOf[Process])
- currentThread.asInstanceOf[Process]
- else
- throw new UnsupportedOperationException("Self called outside a process")
-
- def exit(p: Process, reason: AnyRef) =
- p.exit(reason)
-
-}
-
-@deprecated
-class Process(body: => Unit) extends Actor() {
- private var exitReason: AnyRef = null
- private var links: List[Process] = Nil
-
- override def run() =
- try {
- body
- }
- catch {
- case _: java.lang.InterruptedException =>
- signal(exitReason)
- case (exitSignal) =>
- signal(exitSignal)
- }
-
- private def signal(s: MailBox#Message) =
- links.foreach { p: Process => p.send(('EXIT, this, s)) }
-
- def !(msg: MailBox#Message) =
- send(msg)
-
- def link(p: Process) =
- links = p::links
-
- def spawn_link(body: => Unit) = {
- val p = new Process(body)
- p.link(this)
- p.start()
- p
- }
-
- //def self = this
-
- def exit(reason: AnyRef) {
- exitReason = reason
- interrupt()
- }
-
-}