diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-07-03 14:49:39 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-07-03 14:49:39 -0700 |
commit | e2f866751b00993e80b058a641881f3cc1bc789e (patch) | |
tree | 4d151189e7125b98f1820dfea93554b20f2b736d | |
parent | dcdf85e183cb7ba554a7fc22ad783ca55ecf50dd (diff) | |
parent | 51fe664b29edf21cda7e3cc4e05c78dd1a0a43b7 (diff) | |
download | scala-e2f866751b00993e80b058a641881f3cc1bc789e.tar.gz scala-e2f866751b00993e80b058a641881f3cc1bc789e.tar.bz2 scala-e2f866751b00993e80b058a641881f3cc1bc789e.zip |
Merge pull request #2687 from soc/topic/io-to-interactive
Move some code from s.t.n.io to s.t.n.interactive
-rw-r--r-- | src/interactive/scala/tools/nsc/interactive/Global.scala | 2 | ||||
-rw-r--r-- | src/interactive/scala/tools/nsc/interactive/Lexer.scala (renamed from src/compiler/scala/tools/nsc/io/Lexer.scala) | 2 | ||||
-rw-r--r-- | src/interactive/scala/tools/nsc/interactive/Pickler.scala (renamed from src/compiler/scala/tools/nsc/io/Pickler.scala) | 2 | ||||
-rw-r--r-- | src/interactive/scala/tools/nsc/interactive/Picklers.scala | 4 | ||||
-rw-r--r-- | src/interactive/scala/tools/nsc/interactive/PrettyWriter.scala (renamed from src/compiler/scala/tools/nsc/io/PrettyWriter.scala) | 2 | ||||
-rw-r--r-- | src/interactive/scala/tools/nsc/interactive/Replayer.scala (renamed from src/compiler/scala/tools/nsc/io/Replayer.scala) | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/src/interactive/scala/tools/nsc/interactive/Global.scala b/src/interactive/scala/tools/nsc/interactive/Global.scala index 99f2cd4056..5875a44025 100644 --- a/src/interactive/scala/tools/nsc/interactive/Global.scala +++ b/src/interactive/scala/tools/nsc/interactive/Global.scala @@ -9,7 +9,7 @@ import java.io.{ PrintWriter, StringWriter, FileReader, FileWriter } import scala.collection.mutable import mutable.{LinkedHashMap, SynchronizedMap, HashSet, SynchronizedSet} import scala.util.control.ControlThrowable -import scala.tools.nsc.io.{ AbstractFile, LogReplay, Logger, NullLogger, Replayer } +import scala.tools.nsc.io.{ AbstractFile } import scala.tools.nsc.util.MultiHashMap import scala.reflect.internal.util.{ SourceFile, BatchSourceFile, Position, NoPosition } import scala.tools.nsc.reporters._ diff --git a/src/compiler/scala/tools/nsc/io/Lexer.scala b/src/interactive/scala/tools/nsc/interactive/Lexer.scala index 1c926aff6b..82e8de3f3d 100644 --- a/src/compiler/scala/tools/nsc/io/Lexer.scala +++ b/src/interactive/scala/tools/nsc/interactive/Lexer.scala @@ -1,4 +1,4 @@ -package scala.tools.nsc.io +package scala.tools.nsc.interactive import java.io.Reader diff --git a/src/compiler/scala/tools/nsc/io/Pickler.scala b/src/interactive/scala/tools/nsc/interactive/Pickler.scala index 0e7da37c52..83f3fab925 100644 --- a/src/compiler/scala/tools/nsc/io/Pickler.scala +++ b/src/interactive/scala/tools/nsc/interactive/Pickler.scala @@ -1,4 +1,4 @@ -package scala.tools.nsc.io +package scala.tools.nsc.interactive import Lexer._ import java.io.Writer diff --git a/src/interactive/scala/tools/nsc/interactive/Picklers.scala b/src/interactive/scala/tools/nsc/interactive/Picklers.scala index 900a06333d..e75b4a3cc6 100644 --- a/src/interactive/scala/tools/nsc/interactive/Picklers.scala +++ b/src/interactive/scala/tools/nsc/interactive/Picklers.scala @@ -7,10 +7,10 @@ package interactive import util.InterruptReq import scala.reflect.internal.util.{ SourceFile, BatchSourceFile } -import io.{ AbstractFile, PlainFile, Pickler, CondPickler } +import io.{ AbstractFile, PlainFile } import util.EmptyAction import scala.reflect.internal.util.{ RangePosition, OffsetPosition, TransparentPosition } -import io.Pickler._ +import Pickler._ import scala.collection.mutable import mutable.ListBuffer diff --git a/src/compiler/scala/tools/nsc/io/PrettyWriter.scala b/src/interactive/scala/tools/nsc/interactive/PrettyWriter.scala index 11d3703983..d7dadcc6a8 100644 --- a/src/compiler/scala/tools/nsc/io/PrettyWriter.scala +++ b/src/interactive/scala/tools/nsc/interactive/PrettyWriter.scala @@ -1,4 +1,4 @@ -package scala.tools.nsc.io +package scala.tools.nsc.interactive import java.io.Writer diff --git a/src/compiler/scala/tools/nsc/io/Replayer.scala b/src/interactive/scala/tools/nsc/interactive/Replayer.scala index e3dc8939a3..0e3e2493fe 100644 --- a/src/compiler/scala/tools/nsc/io/Replayer.scala +++ b/src/interactive/scala/tools/nsc/interactive/Replayer.scala @@ -1,4 +1,4 @@ -package scala.tools.nsc.io +package scala.tools.nsc.interactive import java.io.{Reader, Writer} |