Fixing an incomplete svnmerge; first, revert to...

Fixing an incomplete svnmerge; first, revert to r24726.
scala · Apr 20, 2011 · e5ad9c5 · e5ad9c5
1 parent 7c3ec20
commit e5ad9c5
Show file tree

Hide file tree

Showing 327 changed files with 3,429 additions and 5,740 deletions.
diff --git a/build.xml b/build.xml
@@ -375,7 +375,7 @@ LOCAL REFERENCE BUILD (LOCKER)
         <include name="**/*.properties"/>
         <include name="**/*.swf"/>
         <include name="**/*.png"/>
-        <include name="**/*.gif"/>
+
       </fileset>
     </copy>
     <touch file="${build-locker.dir}/compiler.complete" verbose="no"/>
@@ -590,7 +590,6 @@ QUICK BUILD (QUICK)
         <include name="**/*.properties"/>
         <include name="**/*.swf"/>
         <include name="**/*.png"/>
-        <include name="**/*.gif"/>        
       </fileset>
     </copy>
     <touch file="${build-quick.dir}/compiler.complete" verbose="no"/>
@@ -1102,7 +1101,6 @@ BOOTSTRAPPING BUILD (STRAP)
         <include name="**/*.properties"/>
         <include name="**/*.swf"/>
         <include name="**/*.png"/>
-        <include name="**/*.gif"/>        
        </fileset>
     </copy>
     <touch file="${build-strap.dir}/compiler.complete" verbose="no"/>

diff --git a/lib/jline.jar.desired.sha1 b/lib/jline.jar.desired.sha1
@@ -1 +1 @@
-115e0f58e2ffa089c083c466b0161216dd4c916e ?jline.jar
+32f4eb98f8135b0d565e4e7aa72550f34fc4c133 ?jline.jar
diff --git a/lib/scala-compiler.jar.desired.sha1 b/lib/scala-compiler.jar.desired.sha1
@@ -1 +1 @@
-e0382dfa2712e567b49f5826ac50eae59cf03cb3 ?scala-compiler.jar
+4b2f54712dab89071f1909f07367673635beffda ?scala-compiler.jar
diff --git a/lib/scala-library-src.jar.desired.sha1 b/lib/scala-library-src.jar.desired.sha1
@@ -1 +1 @@
-5ad90238f4fc57e8147fb69496c68d02ca073ca0 ?scala-library-src.jar
+f015b1389419b997796a3a9814bedac6343f108e ?scala-library-src.jar
diff --git a/lib/scala-library.jar.desired.sha1 b/lib/scala-library.jar.desired.sha1
@@ -1 +1 @@
-678ada3690dd149c2bd302407e315a74de0bfd42 ?scala-library.jar
+af0438e6911f357a2af0d068482baa1f526dbac0 ?scala-library.jar
diff --git a/src/actors/scala/actors/Debug.scala b/src/actors/scala/actors/Debug.scala
@@ -43,5 +43,5 @@ private[actors] class Logger(tag: String) {
     if (lev > 0) b
 }
 
-@deprecated("this class is going to be removed in a future release", "2.7.7")
+@deprecated("this class is going to be removed in a future release")
 class Debug(tag: String) extends Logger(tag) {}
diff --git a/src/actors/scala/actors/Future.scala b/src/actors/scala/actors/Future.scala
@@ -27,12 +27,12 @@ abstract class Future[+T] extends Responder[T] with Function0[T] {
   private[actors] var fvalue: Option[Any] = None
   private[actors] def fvalueTyped = fvalue.get.asInstanceOf[T]
 
-  @deprecated("this member is going to be removed in a future release", "2.8.0")
+  @deprecated("this member is going to be removed in a future release")
   def ch: InputChannel[Any] = inputChannel
 
-  @deprecated("this member is going to be removed in a future release", "2.8.0")
+  @deprecated("this member is going to be removed in a future release")
   protected def value: Option[Any] = fvalue
-  @deprecated("this member is going to be removed in a future release", "2.8.0")
+  @deprecated("this member is going to be removed in a future release")
   protected def value_=(x: Option[Any]) { fvalue = x }
 
   /** Tests whether the future's result is available.

diff --git a/src/actors/scala/actors/IScheduler.scala b/src/actors/scala/actors/IScheduler.scala
@@ -67,16 +67,16 @@ trait IScheduler {
 
   def managedBlock(blocker: scala.concurrent.ManagedBlocker): Unit
 
-  @deprecated("this member is going to be removed in a future release", "2.7.7")
+  @deprecated("this member is going to be removed in a future release")
   def tick(a: Actor) {}
 
-  @deprecated("this member is going to be removed in a future release", "2.7.7")
+  @deprecated("this member is going to be removed in a future release")
   def onLockup(handler: () => Unit) {}
 
-  @deprecated("this member is going to be removed in a future release", "2.7.7")
+  @deprecated("this member is going to be removed in a future release")
   def onLockup(millis: Int)(handler: () => Unit) {}
 
-  @deprecated("this member is going to be removed in a future release", "2.7.7")
+  @deprecated("this member is going to be removed in a future release")
   def printActorDump {}
 
 }
diff --git a/src/actors/scala/actors/MessageQueue.scala b/src/actors/scala/actors/MessageQueue.scala
@@ -16,7 +16,7 @@ package scala.actors
  * @author Philipp Haller
  */
 @SerialVersionUID(7124278808020037465L)
-@deprecated("this class is going to be removed in a future release", "2.7.7")
+@deprecated("this class is going to be removed in a future release")
 class MessageQueueElement(msg: Any, session: OutputChannel[Any], next: MessageQueueElement) extends MQueueElement[Any](msg, session, next) with Serializable {
   def this() = this(null, null, null)
   def this(msg: Any, session: OutputChannel[Any]) = this(msg, session, null)
@@ -36,7 +36,7 @@ private[actors] class MQueueElement[Msg >: Null](val msg: Msg, val session: Outp
  * @author Philipp Haller
  */
 @SerialVersionUID(2168935872884095767L)
-@deprecated("this class is going to be removed in a future release", "2.7.7")
+@deprecated("this class is going to be removed in a future release")
 class MessageQueue(label: String) extends MQueue[Any](label) with Serializable
 
 private[actors] class MQueue[Msg >: Null](protected val label: String) {

diff --git a/src/actors/scala/actors/Reaction.scala b/src/actors/scala/actors/Reaction.scala
@@ -24,7 +24,7 @@ private[actors] class KillActorControl extends ControlThrowable
  *
  *  @author Philipp Haller
  */
-@deprecated("This class will be removed in a future release", "2.7.7")
+@deprecated("This class will be removed in a future release")
 class Reaction(a: Actor, f: PartialFunction[Any, Any], msg: Any)
 extends ActorTask(a, if (f == null) (() => a.act()) else null, f, msg) {
 

diff --git a/src/actors/scala/actors/Scheduler.scala b/src/actors/scala/actors/Scheduler.scala
@@ -40,7 +40,7 @@ object Scheduler extends DelegatingScheduler {
 
   /* Only <code>ForkJoinScheduler</code> implements this method.
    */
-  @deprecated("snapshot will be removed", "2.8.0")
+  @deprecated("snapshot will be removed")
   def snapshot() {
     if (sched.isInstanceOf[ForkJoinScheduler]) {
       sched.asInstanceOf[ForkJoinScheduler].snapshot()

diff --git a/src/actors/scala/actors/package.scala b/src/actors/scala/actors/package.scala
@@ -20,26 +20,26 @@ package object actors {
   // type of Reactors tracked by termination detector
   private[actors] type TrackedReactor = Reactor[A] forSome { type A >: Null }
 
-  @deprecated("use scheduler.ForkJoinScheduler instead", "2.8.0")
+  @deprecated("use scheduler.ForkJoinScheduler instead")
   type FJTaskScheduler2 = scala.actors.scheduler.ForkJoinScheduler
 
-  @deprecated("use scheduler.ForkJoinScheduler instead", "2.8.0")
+  @deprecated("use scheduler.ForkJoinScheduler instead")
   type TickedScheduler = scala.actors.scheduler.ForkJoinScheduler
 
-  @deprecated("use scheduler.ForkJoinScheduler instead", "2.8.0")
+  @deprecated("use scheduler.ForkJoinScheduler instead")
   type WorkerThreadScheduler = scala.actors.scheduler.ForkJoinScheduler
 
-  @deprecated("this class is going to be removed in a future release", "2.8.0")
+  @deprecated("this class is going to be removed in a future release")
   type WorkerThread = java.lang.Thread
 
-  @deprecated("use scheduler.SingleThreadedScheduler instead", "2.8.0")
+  @deprecated("use scheduler.SingleThreadedScheduler instead")
   type SingleThreadedScheduler = scala.actors.scheduler.SingleThreadedScheduler
 
   // This used to do a blind cast and throw a CCE after the package
   // object was loaded.  I have replaced with a variation that should work
   // in whatever cases that was working but fail less exceptionally for
   // those not intentionally using it.
-  @deprecated("this value is going to be removed in a future release", "2.8.0")
+  @deprecated("this value is going to be removed in a future release")
   val ActorGC = scala.actors.Scheduler.impl match {
     case x: scala.actors.scheduler.ActorGC  => x
     case _                                  => null

diff --git a/src/actors/scala/actors/remote/RemoteActor.scala b/src/actors/scala/actors/remote/RemoteActor.scala
@@ -81,7 +81,7 @@ object RemoteActor {
     kern
   }
 
-  @deprecated("this member is going to be removed in a future release", "2.8.0")
+  @deprecated("this member is going to be removed in a future release")
   def createKernelOnPort(port: Int): NetKernel =
     createNetKernelOnPort(port)
 
@@ -121,7 +121,7 @@ object RemoteActor {
   private[remote] def someNetKernel: NetKernel =
     kernels.valuesIterator.next
 
-  @deprecated("this member is going to be removed in a future release", "2.8.0")
+  @deprecated("this member is going to be removed in a future release")
   def someKernel: NetKernel =
     someNetKernel
 }

diff --git a/src/actors/scala/actors/remote/TcpService.scala b/src/actors/scala/actors/remote/TcpService.scala
@@ -99,17 +99,16 @@ class TcpService(port: Int, cl: ClassLoader) extends Thread with Service {
         // we are not connected, yet
         try {
           val newWorker = connect(node)
+          newWorker transmit data
 
           // any pending sends?
           pendingSends.get(node) match {
             case None =>
               // do nothing
             case Some(msgs) =>
-              msgs.reverse foreach {newWorker transmit _}
+              msgs foreach {newWorker transmit _}
               pendingSends -= node
           }
-
-          newWorker transmit data
         } catch {
           case uhe: UnknownHostException =>
             bufferMsg(uhe)

diff --git a/src/actors/scala/actors/scheduler/TerminationMonitor.scala b/src/actors/scala/actors/scheduler/TerminationMonitor.scala
@@ -66,7 +66,7 @@ private[scheduler] trait TerminationMonitor {
   }
 
   /** Deprecated non-actor-private version */
-  @deprecated("this method is going to be removed in a future release", "2.7.7")
+  @deprecated("this method is going to be removed in a future release")
   def allTerminated: Boolean = allActorsTerminated
 
   /** Checks for actors that have become garbage. */

diff --git a/src/build/genprod.scala b/src/build/genprod.scala
@@ -238,7 +238,7 @@ class Function(val i: Int) extends Group("Function") with Arity {
     curryComment +
     "  def curried: %s => R = {\n    %s\n  }\n".format(
       targs mkString " => ", body
-    ) + """  @deprecated("Use 'curried' instead", "2.8.0")""" + "\n  def curry = curried\n"
+    ) + """  @deprecated("Use 'curried' instead")""" + "\n  def curry = curried\n"
   }
 
   override def moreMethods = curryMethod + tupleMethod
@@ -280,7 +280,7 @@ object TupleTwo extends Tuple(2)
    */
   def swap: Tuple2[T2,T1] = Tuple2(_2, _1)
 
-  @deprecated("Use `zipped` instead.", "2.9.0")
+  @deprecated("Use `zipped` instead.")
   def zip[Repr1, El1, El2, To](implicit w1:   T1 => TLike[El1, Repr1],
                                         w2:   T2 => Iterable[El2],
                                         cbf1: CBF[Repr1, (El1, El2), To]): To = {
@@ -387,7 +387,7 @@ object TupleThree extends Tuple(3) {
   override def imports = Tuple.zipImports
   override def moreMethods = """
 
-  @deprecated("Use `zipped` instead.", "2.9.0")
+  @deprecated("Use `zipped` instead.")
   def zip[Repr1, El1, El2, El3, To](implicit w1:   T1 => TLike[El1, Repr1],
                                              w2:   T2 => Iterable[El2],
                                              w3:   T3 => Iterable[El3],

diff --git a/src/compiler/scala/tools/cmd/gen/AnyVals.scala b/src/compiler/scala/tools/cmd/gen/AnyVals.scala
@@ -206,7 +206,7 @@ final val NaN              = @boxed@.NaN
 final val PositiveInfinity = @boxed@.POSITIVE_INFINITY
 final val NegativeInfinity = @boxed@.NEGATIVE_INFINITY
 
-@deprecated("use @name@.MinPositiveValue instead", "2.9.0")
+@deprecated("use @name@.MinPositiveValue instead")
 final val Epsilon  = MinPositiveValue
 
 /** The negative number with the greatest (finite) absolute value which is representable

diff --git a/src/compiler/scala/tools/nsc/CompileSocket.scala b/src/compiler/scala/tools/nsc/CompileSocket.scala
@@ -95,12 +95,7 @@ class CompileSocket extends CompileOutputCommon {
   private def startNewServer(vmArgs: String) = {
     val cmd = serverCommand(vmArgs split " " toSeq)
     info("[Executing command: %s]" format cmd.mkString(" "))
-
-    // Hiding inadequate daemonized implementation from public API for now
-    Process(cmd) match {
-      case x: ProcessBuilder.AbstractBuilder => x.daemonized().run()
-      case x                                 => x.run()
-    }
+    cmd.daemonized().run()
   }
 
   /** The port identification file */

diff --git a/src/compiler/scala/tools/nsc/ast/DocComments.scala b/src/compiler/scala/tools/nsc/ast/DocComments.scala
@@ -328,18 +328,13 @@ trait DocComments { self: SymbolTable =>
         pos withStart start1 withPoint start1 withEnd end1
       }
 
-    def defineVariables(sym: Symbol) = {
-      val Trim = "(?s)^[\\s&&[^\n\r]]*(.*?)\\s*$".r
-
-      defs(sym) ++= defines.map {
-        str => {
-          val start = skipWhitespace(str, "@define".length)
-          val (key, value) = str.splitAt(skipVariable(str, start))
-          key.drop(start) -> value
-        }
-      } map {
-        case (key, Trim(value)) =>
-          variableName(key) -> value.replaceAll("\\s+\\*+$", "")
+    def defineVariables(sym: Symbol) {
+      for (str <- defines) {
+        val start = skipWhitespace(str, "@define".length)
+        var idx   = skipVariable(str, start)
+        val vble  = variableName(str.substring(start, idx))
+
+        defs(sym) += vble -> (str drop idx).trim.replaceAll("""\s+\*+$""", "")
       }
     }
   }

diff --git a/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala b/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala
@@ -991,7 +991,6 @@ abstract class GenICode extends SubComponent  {
         case Select(qualifier, selector) =>
           val sym = tree.symbol
           generatedType = toTypeKind(sym.info)
-          val hostClass = qualifier.tpe.typeSymbol.orElse(sym.owner)
 
           if (sym.isModule) {
             if (settings.debug.value)
@@ -1000,11 +999,11 @@ abstract class GenICode extends SubComponent  {
             genLoadModule(ctx, sym, tree.pos)
             ctx
           } else if (sym.isStaticMember) {
-            ctx.bb.emit(LOAD_FIELD(sym, true)  setHostClass hostClass, tree.pos)
+            ctx.bb.emit(LOAD_FIELD(sym, true), tree.pos)
             ctx
           } else {
             val ctx1 = genLoadQualifier(tree, ctx)
-            ctx1.bb.emit(LOAD_FIELD(sym, false) setHostClass hostClass, tree.pos)
+            ctx1.bb.emit(LOAD_FIELD(sym, false), tree.pos)
             ctx1
           }
 

diff --git a/src/compiler/scala/tools/nsc/backend/icode/Opcodes.scala b/src/compiler/scala/tools/nsc/backend/icode/Opcodes.scala
@@ -171,11 +171,6 @@ trait Opcodes { self: ICodes =>
 
       override def consumedTypes = if (isStatic) Nil else List(REFERENCE(field.owner));
       override def producedTypes = List(toTypeKind(field.tpe));
-
-      // more precise information about how to load this field
-      // see #4283
-      var hostClass: Symbol = field.owner
-      def setHostClass(cls: Symbol): this.type = { hostClass = cls; this }
     }
 
     case class LOAD_MODULE(module: Symbol) extends Instruction {

diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
@@ -1172,8 +1172,8 @@ abstract class GenJVM extends SubComponent with GenJVMUtil with GenAndroid {
           case LOAD_LOCAL(local) =>
             jcode.emitLOAD(indexOf(local), javaType(local.kind))
 
-          case lf @ LOAD_FIELD(field, isStatic) =>
-            var owner = javaName(lf.hostClass)
+          case LOAD_FIELD(field, isStatic) =>
+            var owner = javaName(field.owner)
             if (settings.debug.value)
               log("LOAD_FIELD with owner: " + owner +
                   " flags: " + Flags.flagsToString(field.owner.flags))

diff --git a/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala b/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala
@@ -534,7 +534,7 @@ abstract class Inliners extends SubComponent {
             if (settings.debug.value)
               log("Making not-private symbol out of synthetic: " + f)
 
-            if (f hasFlag Flags.PRIVATE) f setFlag Flags.notPRIVATE
+            f setFlag Flags.notPRIVATE
             true
           }
 

diff --git a/src/compiler/scala/tools/nsc/doc/Index.scala b/src/compiler/scala/tools/nsc/doc/Index.scala
@@ -5,8 +5,8 @@ import scala.collection._
 
 trait Index {
 
-  type SymbolMap = SortedMap[String, SortedSet[model.MemberEntity]]
+  type SymbolMap = SortedMap[String, SortedSet[model.TemplateEntity]]
 
   def firstLetterIndex: Map[Char, SymbolMap]
 
-}
+}
diff --git a/src/compiler/scala/tools/nsc/doc/html/HtmlFactory.scala b/src/compiler/scala/tools/nsc/doc/html/HtmlFactory.scala
@@ -45,11 +45,11 @@ class HtmlFactory(val universe: doc.Universe, index: doc.Index) {
     copyResource("lib/scheduler.js")
     copyResource("lib/index.js")
     copyResource("lib/template.js")
-
     copyResource("lib/index.css")
     copyResource("lib/ref-index.css")
     copyResource("lib/template.css")
-
+    copyResource("lib/arrow-down.png")
+    copyResource("lib/arrow-right.png")
     copyResource("lib/class.png")
     copyResource("lib/class_big.png")
     copyResource("lib/object.png")
@@ -58,38 +58,9 @@ class HtmlFactory(val universe: doc.Universe, index: doc.Index) {
     copyResource("lib/trait_big.png")
     copyResource("lib/package.png")
     copyResource("lib/package_big.png")
-
-    copyResource("lib/arrow-down.png")
-    copyResource("lib/arrow-right.png")
     copyResource("lib/filter_box_left.png")
     copyResource("lib/filter_box_right.png")
-    copyResource("lib/filter_box_left2.gif")
-    copyResource("lib/filterbg.gif")
-    copyResource("lib/filterboxbarbg.gif")
-    copyResource("lib/filterboxbg.gif")
-
-    copyResource("lib/constructorsbg.gif")
-    copyResource("lib/defbg-blue.gif")
-    copyResource("lib/defbg-green.gif")
-    copyResource("lib/fullcommenttopbg.gif")
-    copyResource("lib/ownderbg2.gif")
-    copyResource("lib/ownerbg.gif")
-    copyResource("lib/ownerbg2.gif")
-    copyResource("lib/signaturebg.gif")
-    copyResource("lib/signaturebg2.gif")
-    copyResource("lib/packagesbg.gif")
-    copyResource("lib/typebg.gif")
-    copyResource("lib/valuemembersbg.gif")
-    copyResource("lib/filterboxbarbg.png")
-
     copyResource("lib/remove.png")
-    copyResource("lib/navigation-li-a.png")
-    copyResource("lib/navigation-li.png")
-    copyResource("lib/selected-right.png")
-    copyResource("lib/selected.png")
-    copyResource("lib/selected2-right.png")
-    copyResource("lib/selected2.png")
-    copyResource("lib/unselected.png")
 
     new page.Index(universe, index) writeFor this