diff options
| author | Miguel Garcia <magarcia@epfl.ch> | 2011-03-27 14:41:46 +0000 |
|---|---|---|
| committer | Miguel Garcia <magarcia@epfl.ch> | 2011-03-27 14:41:46 +0000 |
| commit | 40195b89b3d553e6c11a181c755f711d7bd38981 (patch) | |
| tree | 68d76ac2bba5183da04a0ef413878c0da8dece7b /src | |
| parent | e6d026304f8efbc1f3adde6c16ae75b76d61283e (diff) | |
| download | scala-40195b89b3d553e6c11a181c755f711d7bd38981.tar.gz scala-40195b89b3d553e6c11a181c755f711d7bd38981.tar.bz2 scala-40195b89b3d553e6c11a181c755f711d7bd38981.zip | |
needed when compiling the (jdk2ivkm'd) Scala li...
needed when compiling the (jdk2ivkm'd) Scala library with Scala.NET, and
doesn't hurt in forJVM mode.
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/Global.scala | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala index 5fd5538660..7b23582e74 100644 --- a/src/compiler/scala/tools/nsc/Global.scala +++ b/src/compiler/scala/tools/nsc/Global.scala @@ -1077,13 +1077,15 @@ class Global(var settings: Settings, var reporter: Reporter) extends SymbolTable * */ private def coreClassesFirst(files: List[SourceFile]) = { + val goLast = 4 def rank(f: SourceFile) = { - if (f.file.container.name != "scala") 3 + if (f.file.container.name != "scala") goLast else f.file.name match { case "ScalaObject.scala" => 1 case "LowPriorityImplicits.scala" => 2 case "StandardEmbeddings.scala" => 2 - case _ => 3 + case "Predef.scala" => 3 /* Predef.scala before Any.scala, etc. */ + case _ => goLast } } files sortBy rank |