diff options
author | Martin Odersky <odersky@gmail.com> | 2010-09-29 15:42:39 +0000 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2010-09-29 15:42:39 +0000 |
commit | 4697416af31b66997e8f837fc325cfd76096cbd6 (patch) | |
tree | facf51aa0d15e86b28d3a7726552d46170f91fd9 /src | |
parent | 57f2b3d5e06fd2a0238baea8242ac7ba80960891 (diff) | |
download | scala-4697416af31b66997e8f837fc325cfd76096cbd6.tar.gz scala-4697416af31b66997e8f837fc325cfd76096cbd6.tar.bz2 scala-4697416af31b66997e8f837fc325cfd76096cbd6.zip |
Reverted an earlier binary incompatible change ...
Reverted an earlier binary incompatible change rolled into r23139. Now,
the presentation compiler should have no binary incompatibilties with
2.8.0
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/tools/nsc/interactive/CompilerControl.scala | 2 | ||||
-rw-r--r-- | src/compiler/scala/tools/nsc/interactive/Global.scala | 14 |
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 7edb0263fc..5258849b8c 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 7ece74acb6..e9e931f938 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) @@ -288,7 +288,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) @@ -315,8 +315,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 ----------------------- @@ -352,7 +352,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) @@ -363,7 +363,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 |