Merged revisions 23144 via svnmerge from

https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk

........
  r23144 | odersky | 2010-09-29 17:42:39 +0200 (Wed, 29 Sep 2010) | 1 line

  Reverted an earlier binary incompatible change rolled into r23139.
Now, the presentation compiler should have no binary incompatibilties
with 2.8.0 ........

2 files changed, 8 insertions, 8 deletions

diff --git a/src/compiler/scala/tools/nsc/interactive/CompilerControl.scala b/src/compiler/scala/tools/nsc/interactive/CompilerControl.scala
index 0ae137b23b..1772f6f722 100644
--- a/src/compiler/scala/tools/nsc/interactive/CompilerControl.scala
+++ b/src/compiler/scala/tools/nsc/interactive/CompilerControl.scala
@@ -91,7 +91,7 @@ trait CompilerControl { self: Global =>
   /** Make sure a set of compilation units is loaded and parsed.
    *  Return () to syncvar `result` on completion.
    */
-  def askReload(sources: Seq[SourceFile], result: Response[Unit]) =
+  def askReload(sources: List[SourceFile], result: Response[Unit]) =
     scheduler postWorkItem new WorkItem {
       def apply() = reload(sources, result)
       override def toString = "reload "+sources
diff --git a/src/compiler/scala/tools/nsc/interactive/Global.scala b/src/compiler/scala/tools/nsc/interactive/Global.scala
index e47c511260..260ebf2351 100644
--- a/src/compiler/scala/tools/nsc/interactive/Global.scala
+++ b/src/compiler/scala/tools/nsc/interactive/Global.scala
@@ -33,7 +33,7 @@ self =>
    *  All units in firsts are typechecked before any unit not in this list
    *  Modified by askToDoFirst, reload, typeAtTree.
    */
-  var firsts: Seq[SourceFile] = Seq()
+  var firsts: List[SourceFile] = List()
 
   /** A map of all loaded files to the rich compilation units that correspond to them.
    */
@@ -257,7 +257,7 @@ self =>
 
     val prefix = firsts map unitOf
 
-    val units = prefix ++ (unitOfFile.values.toSeq diff prefix) filter (!_.isUpToDate)
+    val units = prefix ::: (unitOfFile.values.toList diff prefix) filter (!_.isUpToDate)
 
     recompile(units)
 
@@ -287,7 +287,7 @@ self =>
 
   /** Make sure symbol and type attributes are reset and recompile units.
    */
-  def recompile(units: Seq[RichCompilationUnit]) {
+  def recompile(units: List[RichCompilationUnit]) {
     for (unit <- units) {
       reset(unit)
       if (debugIDE) inform("parsing: "+unit)
@@ -314,8 +314,8 @@ self =>
   }
 
   /** Move list of files to front of firsts */
-  def moveToFront(fs: Seq[SourceFile]) {
-    firsts = fs ++ (firsts diff fs)
+  def moveToFront(fs: List[SourceFile]) {
+    firsts = fs ::: (firsts diff fs)
   }
 
   // ----------------- Implementations of client commands -----------------------
@@ -351,7 +351,7 @@ self =>
   }
 
   /** Make sure a set of compilation units is loaded and parsed */
-  def reloadSources(sources: Seq[SourceFile]) {
+  def reloadSources(sources: List[SourceFile]) {
     currentTyperRun = newTyperRun
     for (source <- sources) {
       val unit = new RichCompilationUnit(source)
@@ -362,7 +362,7 @@ self =>
   }
 
   /** Make sure a set of compilation units is loaded and parsed */
-  def reload(sources: Seq[SourceFile], response: Response[Unit]) {
+  def reload(sources: List[SourceFile], response: Response[Unit]) {
     respond(response)(reloadSources(sources))
     if (outOfDate) throw FreshRunReq // cancel background compile
     else outOfDate = true            // proceed normally and enable new background compile