nested pacpakges for actor.wscheduler; fixed bu...

nested pacpakges for actor.wscheduler; fixed build problems

15 files changed, 29 insertions, 16 deletions

diff --git a/src/actors/scala/actors/scheduler/DaemonScheduler.scala b/src/actors/scala/actors/scheduler/DaemonScheduler.scala
index ee4df16b47..d748e8fa75 100644
--- a/src/actors/scala/actors/scheduler/DaemonScheduler.scala
+++ b/src/actors/scala/actors/scheduler/DaemonScheduler.scala
@@ -6,7 +6,8 @@
 **                          |/                                          **
 \*                                                                      */
 
-package scala.actors.scheduler
+package scala.actors
+package scheduler
 
 /**
  * Default scheduler for actors with daemon semantics, such as those backing futures.
diff --git a/src/actors/scala/actors/scheduler/DefaultExecutorScheduler.scala b/src/actors/scala/actors/scheduler/DefaultExecutorScheduler.scala
index afda4a91c0..88ccb6dce8 100644
--- a/src/actors/scala/actors/scheduler/DefaultExecutorScheduler.scala
+++ b/src/actors/scala/actors/scheduler/DefaultExecutorScheduler.scala
@@ -8,7 +8,8 @@
 
 // $Id$
 
-package scala.actors.scheduler
+package scala.actors
+package scheduler
 
 import java.util.concurrent.{ThreadPoolExecutor, TimeUnit, LinkedBlockingQueue, ThreadFactory}
 
diff --git a/src/actors/scala/actors/scheduler/DelegatingScheduler.scala b/src/actors/scala/actors/scheduler/DelegatingScheduler.scala
index 21785ff2e4..4bd2d09bd0 100644
--- a/src/actors/scala/actors/scheduler/DelegatingScheduler.scala
+++ b/src/actors/scala/actors/scheduler/DelegatingScheduler.scala
@@ -6,7 +6,8 @@
 **                          |/                                          **
 \*                                                                      */
 
-package scala.actors.scheduler
+package scala.actors
+package scheduler
 
 /**
  * @author Erik Engbrecht
diff --git a/src/actors/scala/actors/scheduler/DrainableForkJoinPool.scala b/src/actors/scala/actors/scheduler/DrainableForkJoinPool.scala
index 994bac3dc2..af5bc2c595 100644
--- a/src/actors/scala/actors/scheduler/DrainableForkJoinPool.scala
+++ b/src/actors/scala/actors/scheduler/DrainableForkJoinPool.scala
@@ -1,4 +1,5 @@
-package scala.actors.scheduler
+package scala.actors
+package scheduler
 
 import java.util.Collection
 import forkjoin.{ForkJoinPool, ForkJoinTask}
diff --git a/src/actors/scala/actors/scheduler/ExecutorScheduler.scala b/src/actors/scala/actors/scheduler/ExecutorScheduler.scala
index 2684b32228..8e032242f6 100644
--- a/src/actors/scala/actors/scheduler/ExecutorScheduler.scala
+++ b/src/actors/scala/actors/scheduler/ExecutorScheduler.scala
@@ -8,7 +8,8 @@
 
 // $Id$
 
-package scala.actors.scheduler
+package scala.actors
+package scheduler
 
 import java.util.concurrent.{ExecutorService, RejectedExecutionException}
 
diff --git a/src/actors/scala/actors/scheduler/ForkJoinScheduler.scala b/src/actors/scala/actors/scheduler/ForkJoinScheduler.scala
index 089a7639f2..5d6d676b1a 100644
--- a/src/actors/scala/actors/scheduler/ForkJoinScheduler.scala
+++ b/src/actors/scala/actors/scheduler/ForkJoinScheduler.scala
@@ -1,4 +1,5 @@
-package scala.actors.scheduler
+package scala.actors
+package scheduler
 
 import java.lang.Thread.State
 import java.util.{Collection, ArrayList}
diff --git a/src/actors/scala/actors/scheduler/SchedulerService.scala b/src/actors/scala/actors/scheduler/SchedulerService.scala
index ac8c621074..2ae218bb24 100644
--- a/src/actors/scala/actors/scheduler/SchedulerService.scala
+++ b/src/actors/scala/actors/scheduler/SchedulerService.scala
@@ -8,7 +8,8 @@
 
 // $Id: $
 
-package scala.actors.scheduler
+package scala.actors
+package scheduler
 
 import scala.util.control.ControlException
 import java.lang.{Runnable, Thread, InterruptedException}
diff --git a/src/actors/scala/actors/scheduler/SimpleExecutorScheduler.scala b/src/actors/scala/actors/scheduler/SimpleExecutorScheduler.scala
index fdcc2cbd4d..d77777caae 100644
--- a/src/actors/scala/actors/scheduler/SimpleExecutorScheduler.scala
+++ b/src/actors/scala/actors/scheduler/SimpleExecutorScheduler.scala
@@ -8,7 +8,8 @@
 
 // $Id$
 
-package scala.actors.scheduler
+package scala.actors
+package scheduler
 
 import java.util.concurrent.ExecutorService
 
diff --git a/src/actors/scala/actors/scheduler/SingleThreadedScheduler.scala b/src/actors/scala/actors/scheduler/SingleThreadedScheduler.scala
index b6de36b069..c7e588f2ed 100644
--- a/src/actors/scala/actors/scheduler/SingleThreadedScheduler.scala
+++ b/src/actors/scala/actors/scheduler/SingleThreadedScheduler.scala
@@ -8,7 +8,8 @@
 
 // $Id$
 
-package scala.actors.scheduler
+package scala.actors
+package scheduler
 
 /**
  * This scheduler executes the tasks of an actor on a single
diff --git a/src/actors/scala/actors/scheduler/TerminationMonitor.scala b/src/actors/scala/actors/scheduler/TerminationMonitor.scala
index 9437a9a168..47d408dc1a 100644
--- a/src/actors/scala/actors/scheduler/TerminationMonitor.scala
+++ b/src/actors/scala/actors/scheduler/TerminationMonitor.scala
@@ -8,7 +8,8 @@
 
 // $Id:$
 
-package scala.actors.scheduler
+package scala.actors
+package scheduler
 
 import scala.collection.mutable.HashMap
 
diff --git a/src/actors/scala/actors/scheduler/TerminationService.scala b/src/actors/scala/actors/scheduler/TerminationService.scala
index e3ee8971fc..aafa620a08 100644
--- a/src/actors/scala/actors/scheduler/TerminationService.scala
+++ b/src/actors/scala/actors/scheduler/TerminationService.scala
@@ -8,7 +8,8 @@
 
 // $Id: $
 
-package scala.actors.scheduler
+package scala.actors
+package scheduler
 
 import java.lang.{Runnable, Thread, InterruptedException}
 
diff --git a/src/actors/scala/actors/scheduler/ThreadPoolConfig.scala b/src/actors/scala/actors/scheduler/ThreadPoolConfig.scala
index 8a1075a652..3c2f5ce5da 100644
--- a/src/actors/scala/actors/scheduler/ThreadPoolConfig.scala
+++ b/src/actors/scala/actors/scheduler/ThreadPoolConfig.scala
@@ -8,7 +8,8 @@
 
 // $Id$
 
-package scala.actors.scheduler
+package scala.actors
+package scheduler
 
 /**
  * @author Erik Engbrecht
diff --git a/src/actors/scala/actors/scheduler/ThreadPoolScheduler.scala b/src/actors/scala/actors/scheduler/ThreadPoolScheduler.scala
index 568a045631..4826d44383 100644
--- a/src/actors/scala/actors/scheduler/ThreadPoolScheduler.scala
+++ b/src/actors/scala/actors/scheduler/ThreadPoolScheduler.scala
@@ -8,7 +8,8 @@
 
 // $Id$
 
-package scala.actors.scheduler
+package scala.actors
+package scheduler
 
 import java.util.concurrent.ThreadPoolExecutor
 
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