diff options
author | mihaylov <mihaylov@epfl.ch> | 2006-06-22 11:55:00 +0000 |
---|---|---|
committer | mihaylov <mihaylov@epfl.ch> | 2006-06-22 11:55:00 +0000 |
commit | a833d535ec9ca01a8fea7bf9a7a7a6338a227435 (patch) | |
tree | da5d06352ac2aa08bc6ec2da5df4269bd89e88ed | |
parent | 013b381743d854c6defbc3f0924f21a0c99498e7 (diff) | |
download | scala-a833d535ec9ca01a8fea7bf9a7a7a6338a227435.tar.gz scala-a833d535ec9ca01a8fea7bf9a7a7a6338a227435.tar.bz2 scala-a833d535ec9ca01a8fea7bf9a7a7a6338a227435.zip |
Renamed 2 files in the actor library to prevent...
Renamed 2 files in the actor library to prevent their unnecessary
recompilation
-rw-r--r-- | src/actors/scala/actors/distributed/SystemMessage.scala (renamed from src/actors/scala/actors/distributed/Messages.scala) | 0 | ||||
-rw-r--r-- | src/actors/scala/actors/distributed/picklers/Stream.scala (renamed from src/actors/scala/actors/distributed/picklers/Streams.scala) | 22 |
2 files changed, 8 insertions, 14 deletions
diff --git a/src/actors/scala/actors/distributed/Messages.scala b/src/actors/scala/actors/distributed/SystemMessage.scala index d8a663922a..d8a663922a 100644 --- a/src/actors/scala/actors/distributed/Messages.scala +++ b/src/actors/scala/actors/distributed/SystemMessage.scala diff --git a/src/actors/scala/actors/distributed/picklers/Streams.scala b/src/actors/scala/actors/distributed/picklers/Stream.scala index fa294785ab..65e59b975d 100644 --- a/src/actors/scala/actors/distributed/picklers/Streams.scala +++ b/src/actors/scala/actors/distributed/picklers/Stream.scala @@ -2,41 +2,35 @@ package scala.actors.distributed.picklers; import java.io.Reader; import java.io.Writer; -import java.io.BufferedReader; -import java.io.BufferedWriter; -import scala.collection.mutable._; +import scala.collection.mutable.HashMap; -class OutStream(writer: Writer) { - val picklerEnv = new PicklerEnv; - - private var loc: int = 0; +abstract class Stream { + protected var loc: int = 0; def getLocation = loc; +} + +class OutStream(writer: Writer) extends Stream { + val picklerEnv = new PicklerEnv; def write(s: String): unit = { loc = loc + s.length() writer.write(s) - //Console.println("new loc: " + loc) } def write(c: char): unit = { loc = loc + 1 writer.write(c) - //Console.println("new loc: " + loc) } def flush(): unit = writer.flush(); } -class InStream(reader: Reader) { +class InStream(reader: Reader) extends Stream { val unpicklerEnv = new UnpicklerEnv; - private var loc: int = 0; - - def getLocation = loc; - def read(num: int): String = { val carr = new Array[char](num) val cnt = reader.read(carr) |