diff options
| author | Paul Phillips <paulp@improving.org> | 2011-06-11 20:33:09 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-06-11 20:33:09 +0000 |
| commit | 25d692b76fe30e31c9b51c93c1604d619a80b4d4 (patch) | |
| tree | 46fbfc7267ffe962fe96a41382878d503f6dc605 /src/compiler/scala/tools/nsc/Global.scala | |
| parent | f0ca26ab84172034f3ac41639d1a5dce242f9a5a (diff) | |
| download | scala-25d692b76fe30e31c9b51c93c1604d619a80b4d4.tar.gz scala-25d692b76fe30e31c9b51c93c1604d619a80b4d4.tar.bz2 scala-25d692b76fe30e31c9b51c93c1604d619a80b4d4.zip | |
Informs the bootstrap code which preferences ce...
Informs the bootstrap code which preferences certain source files about
EmbeddedControls.scala, necessary so that starrs from trunk can be used
to build scala-virtualized. No review.
Diffstat (limited to 'src/compiler/scala/tools/nsc/Global.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/Global.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala index 9405d11a02..177bd8dbbd 100644 --- a/src/compiler/scala/tools/nsc/Global.scala +++ b/src/compiler/scala/tools/nsc/Global.scala @@ -1105,7 +1105,7 @@ class Global(var currentSettings: Settings, var reporter: Reporter) extends Symb /** * Re-orders the source files to * 1. ScalaObject - * 2. LowPriorityImplicits / StandardEmbeddings (i.e. parents of Predef) + * 2. LowPriorityImplicits / EmbeddedControls (i.e. parents of Predef) * 3. the rest * * 1 is to avoid cyclic reference errors. @@ -1135,6 +1135,7 @@ class Global(var currentSettings: Settings, var reporter: Reporter) extends Symb case "ScalaObject.scala" => 1 case "LowPriorityImplicits.scala" => 2 case "StandardEmbeddings.scala" => 2 + case "EmbeddedControls.scala" => 2 case "Predef.scala" => 3 /* Predef.scala before Any.scala, etc. */ case _ => goLast } |