diff options
| author | Martin Odersky <odersky@gmail.com> | 2009-07-24 18:26:08 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2009-07-24 18:26:08 +0000 |
| commit | 22edfb28815f785a40e9444e5c16d3820eec1b02 (patch) | |
| tree | cf5bf82f6ea2482027b25f0e841974c1c922fec4 /src/compiler | |
| parent | 40707e0f49eb991ba1cbc07bdb1bcf65a640006b (diff) | |
| download | scala-22edfb28815f785a40e9444e5c16d3820eec1b02.tar.gz scala-22edfb28815f785a40e9444e5c16d3820eec1b02.tar.bz2 scala-22edfb28815f785a40e9444e5c16d3820eec1b02.zip | |
nested pacpakges for actor.wscheduler; fixed bu...
nested pacpakges for actor.wscheduler; fixed build problems
Diffstat (limited to 'src/compiler')
| -rwxr-xr-x | src/compiler/scala/tools/nsc/interactive/Global.scala | 4 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/interactive/Global.scala b/src/compiler/scala/tools/nsc/interactive/Global.scala index c8f7de2666..04f3e63ef9 100755 --- a/src/compiler/scala/tools/nsc/interactive/Global.scala +++ b/src/compiler/scala/tools/nsc/interactive/Global.scala @@ -22,12 +22,12 @@ class Global(settings: Settings, reporter: Reporter) with RichCompilationUnits { self => - settings.XprintPos.value = true - import definitions._ override def onlyPresentation = true + settings.Xprintpos.value = true + /** A list indicating in which order some units should be typechecked. * All units in firsts are typechecked before any unit not in this list * Modified by askToDoFirst, reload, typeAtTree. diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index 3b9ebf53b8..6ef2f61deb 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -1763,7 +1763,7 @@ trait Typers { self: Analyzer => } EmptyTree case _ => - if (localTarget && !includesTargetPos(tree)) + if (localTarget && !includesTargetPos(stat)) { stat } else { val localTyper = if (inBlock || (stat.isDef && !stat.isInstanceOf[LabelDef])) this |