diff options
author | Lukas Rytz <lukas.rytz@epfl.ch> | 2009-11-04 18:25:19 +0000 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2009-11-04 18:25:19 +0000 |
commit | a4895b85928399db4ed8d744ac3fc7208bee3a2f (patch) | |
tree | d35b8e593c23ca9532c2e90a87e04166132f5f40 /src | |
parent | dbf0e12c15a0c0f3ac8833ecf70d0228ab0f1c3e (diff) | |
download | scala-a4895b85928399db4ed8d744ac3fc7208bee3a2f.tar.gz scala-a4895b85928399db4ed8d744ac3fc7208bee3a2f.tar.bz2 scala-a4895b85928399db4ed8d744ac3fc7208bee3a2f.zip |
fix cyclic reference errors in scaladoc.
Diffstat (limited to 'src')
65 files changed, 59 insertions, 142 deletions
diff --git a/src/android-library/scala/ScalaObject.scala b/src/android-library/scala/ScalaObject.scala index 91f74c1cc1..b532f4e55f 100644 --- a/src/android-library/scala/ScalaObject.scala +++ b/src/android-library/scala/ScalaObject.scala @@ -11,6 +11,4 @@ package scala -import Predef._ - trait ScalaObject extends AnyRef diff --git a/src/build/genprod.scala b/src/build/genprod.scala index 2b0cad8ce0..8abbe2d77b 100644 --- a/src/build/genprod.scala +++ b/src/build/genprod.scala @@ -306,8 +306,6 @@ class Product(val i: Int) extends Group("Product") with Arity def apply() = { <file name={fileName}>{header} -import Predef._ - object {className} {{ def unapply{invariantArgs}(x: {className}{invariantArgs}): Option[{className}{invariantArgs}] = Some(x) @@ -315,6 +313,7 @@ object {className} {{ /** {className} is a cartesian product of {i} component{s}. * {descriptiveComment} + * @since 2.3 */ trait {className}{covariantArgs} extends Product {{ /** diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala index 8c8d0be322..191016e133 100644 --- a/src/compiler/scala/tools/nsc/Global.scala +++ b/src/compiler/scala/tools/nsc/Global.scala @@ -777,7 +777,8 @@ class Global(var settings: Settings, var reporter: Reporter) extends SymbolTable /** Compile list of source files */ def compileSources(_sources: List[SourceFile]) { - val sources = dependencyAnalysis.filter(_sources.removeDuplicates) // bug #1268, scalac confused by duplicated filenames + val depSources = dependencyAnalysis.filter(_sources.removeDuplicates) // bug #1268, scalac confused by duplicated filenames + val sources = pkgObjectsFirst(depSources) if (reporter.hasErrors) return // there is a problem already, e.g. a // plugin was passed a bad option @@ -921,6 +922,27 @@ class Global(var settings: Settings, var reporter: Reporter) extends SymbolTable } if (!pclazz.isRoot) resetPackageClass(pclazz.owner) } + + private def pkgObjectsFirst(files: List[SourceFile]) = { + def inScalaFolder(f: SourceFile) = + f.file.container.name == "scala" + val res = new ListBuffer[SourceFile] + var scalaObject: Option[SourceFile] = None + var lowPriorityImplicits: Option[SourceFile] = None + var predef: Option[SourceFile] = None + for (file <- files) file.file.name match { + case "ScalaObject.scala" if inScalaFolder(file) => scalaObject = Some(file) + case "LowPriorityImplicits.scala" if inScalaFolder(file) => lowPriorityImplicits = Some(file) + case "Predef.scala" if inScalaFolder(file) => predef = Some(file) + case "package.scala" => file +=: res // prepend package objects + case _ => res += file // append all others + } + val f: SourceFile => Unit = res.+=:(_) + predef map f // Predef 3rd + lowPriorityImplicits map f // LowPriorityImplicits 2nd + scalaObject map f // ScalaObject 1st + res.toList // then package objects, then others + } } // class Run def printAllUnits() { diff --git a/src/compiler/scala/tools/nsc/ast/TreeInfo.scala b/src/compiler/scala/tools/nsc/ast/TreeInfo.scala index 836d23760d..e128b4e12f 100644 --- a/src/compiler/scala/tools/nsc/ast/TreeInfo.scala +++ b/src/compiler/scala/tools/nsc/ast/TreeInfo.scala @@ -336,16 +336,16 @@ abstract class TreeInfo { /** Compilation unit is the predef object */ - def isPredefUnit(tree: Tree): Boolean = tree match { - case PackageDef(Ident(nme.scala_), defs) => isPredefObj(defs) + def isUnitInScala(tree: Tree, name: Name) = tree match { + case PackageDef(Ident(nme.scala_), defs) => isObject(defs, name) case _ => false } - private def isPredefObj(trees: List[Tree]): Boolean = trees match { - case Import(_, _) :: xs => isPredefObj(xs) - case ModuleDef(_, nme.Predef, _) :: Nil => true - case DocDef(_, tree1) :: Nil => isPredefObj(List(tree1)) - case Annotated(_, tree1) :: Nil => isPredefObj(List(tree1)) + private def isObject(trees: List[Tree], name: Name): Boolean = trees match { + case Import(_, _) :: xs => isObject(xs, name) + case DocDef(_, tree1) :: Nil => isObject(List(tree1), name) + case Annotated(_, tree1) :: Nil => isObject(List(tree1), name) + case ModuleDef(_, `name`, _) :: Nil => true case _ => false } diff --git a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala index cc8b069607..2be187381f 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala @@ -46,7 +46,9 @@ trait Contexts { self: Analyzer => if (!unit.isJava) { assert(ScalaPackage ne null, "Scala package is null") imps += ScalaPackage - if (!(treeInfo.isPredefUnit(unit.body) || treeInfo.containsLeadingPredefImport(List(unit.body)))) + if (!(treeInfo.isUnitInScala(unit.body, nme.Predef) || + treeInfo.isUnitInScala(unit.body, nme.ScalaObject) || + treeInfo.containsLeadingPredefImport(List(unit.body)))) imps += PredefModule } } diff --git a/src/library/scala/BigDecimal.scala b/src/library/scala/BigDecimal.scala index 7b11cf48b1..fc874db1f2 100644 --- a/src/library/scala/BigDecimal.scala +++ b/src/library/scala/BigDecimal.scala @@ -12,7 +12,7 @@ package scala import java.{ lang => jl } import java.math.{ MathContext, BigDecimal => BigDec } -import scala.collection.immutable.{Range, GenericRange} +import scala.collection.immutable.GenericRange /** Conversions which present a consistent conversion interface * across all the numeric types. diff --git a/src/library/scala/BigInt.scala b/src/library/scala/BigInt.scala index 46e074d036..dd84371123 100644 --- a/src/library/scala/BigInt.scala +++ b/src/library/scala/BigInt.scala @@ -13,7 +13,6 @@ package scala import java.math.BigInteger import java.{ lang => jl } -import scala.collection.immutable.Range /** * @author Martin Odersky diff --git a/src/library/scala/Console.scala b/src/library/scala/Console.scala index fd9b6efc8f..8be1e0f8dc 100644 --- a/src/library/scala/Console.scala +++ b/src/library/scala/Console.scala @@ -14,10 +14,7 @@ package scala import java.io.{BufferedReader, InputStream, InputStreamReader, IOException, OutputStream, PrintStream, Reader} import java.text.MessageFormat -import scala.collection.immutable.{List, Nil} -import scala.collection.Seq import scala.util.DynamicVariable -import Predef._ /** The <code>Console</code> object implements functionality for diff --git a/src/library/scala/CountedIterator.scala b/src/library/scala/CountedIterator.scala index 35a564fc6a..ed3ac99f0e 100644 --- a/src/library/scala/CountedIterator.scala +++ b/src/library/scala/CountedIterator.scala @@ -11,8 +11,6 @@ package scala -import collection.Iterator - /** Counted iterators keep track of the number of elements seen so far * * @since 2.0 diff --git a/src/library/scala/Either.scala b/src/library/scala/Either.scala index 5e1d231272..cc84685287 100644 --- a/src/library/scala/Either.scala +++ b/src/library/scala/Either.scala @@ -11,9 +11,6 @@ package scala -import collection.{Iterable, Seq} -import collection.immutable.{List, Nil, ::} - /** <p> * The <code>Either</code> type represents a value of one of two possible * types (a disjoint union). The data constructors <code>Left</code> and diff --git a/src/library/scala/Enumeration.scala b/src/library/scala/Enumeration.scala index d5153bd50d..01f99d550a 100644 --- a/src/library/scala/Enumeration.scala +++ b/src/library/scala/Enumeration.scala @@ -11,7 +11,7 @@ package scala -import scala.collection.{SetLike, Iterator} +import scala.collection.SetLike import scala.collection.mutable.{Builder, AddingBuilder, Map, HashMap} import scala.collection.immutable.{Set, BitSet} import scala.collection.generic.CanBuildFrom diff --git a/src/library/scala/MatchError.scala b/src/library/scala/MatchError.scala index 0622826bc9..cc8aef4635 100644 --- a/src/library/scala/MatchError.scala +++ b/src/library/scala/MatchError.scala @@ -11,8 +11,6 @@ package scala -import Predef._ - /** This class implements errors which are thrown whenever an * object doesn't match any pattern of a pattern matching * expression. diff --git a/src/library/scala/NotDefinedError.scala b/src/library/scala/NotDefinedError.scala index b088dcc681..75a835b83e 100644 --- a/src/library/scala/NotDefinedError.scala +++ b/src/library/scala/NotDefinedError.scala @@ -11,9 +11,6 @@ package scala - -import Predef._ - /** * @since 2.0 */ diff --git a/src/library/scala/Option.scala b/src/library/scala/Option.scala index 971c686b19..cabf3cf74b 100644 --- a/src/library/scala/Option.scala +++ b/src/library/scala/Option.scala @@ -11,10 +11,7 @@ package scala -import Predef._ import annotation.experimental -import collection.{Iterator, Iterable} -import collection.immutable.List object Option { diff --git a/src/library/scala/Ordering.scala b/src/library/scala/Ordering.scala index f2cdd3a1f0..223d0bf37d 100644 --- a/src/library/scala/Ordering.scala +++ b/src/library/scala/Ordering.scala @@ -12,7 +12,6 @@ package scala import java.util.Comparator -import collection.Iterable /** A trait for representing total orderings. It is important to * distinguish between a type that has a total order and a representation diff --git a/src/library/scala/Product.scala b/src/library/scala/Product.scala index 6b5ae6fadd..ce8f733771 100644 --- a/src/library/scala/Product.scala +++ b/src/library/scala/Product.scala @@ -11,8 +11,6 @@ package scala -import collection.Iterator - /** The trait <code>Product</code> defines access functions for instances * of products, in particular case classes. * diff --git a/src/library/scala/Product1.scala b/src/library/scala/Product1.scala index 8c77bde460..72f16accdd 100644 --- a/src/library/scala/Product1.scala +++ b/src/library/scala/Product1.scala @@ -8,13 +8,11 @@ // $Id$ -// generated by genprod on Wed Jun 17 14:10:05 PDT 2009 +// generated by genprod on Wed Nov 04 18:46:21 CET 2009 package scala -import Predef._ - object Product1 { def unapply[T1](x: Product1[T1]): Option[Product1[T1]] = Some(x) diff --git a/src/library/scala/Product10.scala b/src/library/scala/Product10.scala index a32c3c92c9..bd786e0a07 100644 --- a/src/library/scala/Product10.scala +++ b/src/library/scala/Product10.scala @@ -8,13 +8,11 @@ // $Id$ -// generated by genprod on Wed Jun 17 14:10:05 PDT 2009 +// generated by genprod on Wed Nov 04 18:46:21 CET 2009 package scala -import Predef._ - object Product10 { def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10](x: Product10[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]): Option[Product10[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]] = Some(x) diff --git a/src/library/scala/Product11.scala b/src/library/scala/Product11.scala index 17d169a42a..ff56827537 100644 --- a/src/library/scala/Product11.scala +++ b/src/library/scala/Product11.scala @@ -8,13 +8,11 @@ // $Id$ -// generated by genprod on Wed Jun 17 14:10:05 PDT 2009 +// generated by genprod on Wed Nov 04 18:46:21 CET 2009 package scala -import Predef._ - object Product11 { def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11](x: Product11[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11]): Option[Product11[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11]] = Some(x) diff --git a/src/library/scala/Product12.scala b/src/library/scala/Product12.scala index b2021f35eb..0434ffc205 100644 --- a/src/library/scala/Product12.scala +++ b/src/library/scala/Product12.scala @@ -8,13 +8,11 @@ // $Id$ -// generated by genprod on Wed Jun 17 14:10:05 PDT 2009 +// generated by genprod on Wed Nov 04 18:46:21 CET 2009 package scala -import Predef._ - object Product12 { def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12](x: Product12[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12]): Option[Product12[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12]] = Some(x) diff --git a/src/library/scala/Product13.scala b/src/library/scala/Product13.scala index 77e4ed4922..992992cb10 100644 --- a/src/library/scala/Product13.scala +++ b/src/library/scala/Product13.scala @@ -8,13 +8,11 @@ // $Id$ -// generated by genprod on Wed Jun 17 14:10:05 PDT 2009 +// generated by genprod on Wed Nov 04 18:46:21 CET 2009 package scala -import Predef._ - object Product13 { def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13](x: Product13[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13]): Option[Product13[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13]] = Some(x) diff --git a/src/library/scala/Product14.scala b/src/library/scala/Product14.scala index 73712f5432..1966400eb0 100644 --- a/src/library/scala/Product14.scala +++ b/src/library/scala/Product14.scala @@ -8,13 +8,11 @@ // $Id$ -// generated by genprod on Wed Jun 17 14:10:05 PDT 2009 +// generated by genprod on Wed Nov 04 18:46:21 CET 2009 package scala -import Predef._ - object Product14 { def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14](x: Product14[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14]): Option[Product14[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14]] = Some(x) diff --git a/src/library/scala/Product15.scala b/src/library/scala/Product15.scala index 6cc210a206..2683dbe549 100644 --- a/src/library/scala/Product15.scala +++ b/src/library/scala/Product15.scala @@ -8,13 +8,11 @@ // $Id$ -// generated by genprod on Wed Jun 17 14:10:05 PDT 2009 +// generated by genprod on Wed Nov 04 18:46:21 CET 2009 package scala -import Predef._ - object Product15 { def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15](x: Product15[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15]): Option[Product15[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15]] = Some(x) diff --git a/src/library/scala/Product16.scala b/src/library/scala/Product16.scala index b750529686..119cfe759b 100644 --- a/src/library/scala/Product16.scala +++ b/src/library/scala/Product16.scala @@ -8,13 +8,11 @@ // $Id$ -// generated by genprod on Wed Jun 17 14:10:05 PDT 2009 +// generated by genprod on Wed Nov 04 18:46:21 CET 2009 package scala -import Predef._ - object Product16 { def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16](x: Product16[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16]): Option[Product16[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16]] = Some(x) diff --git a/src/library/scala/Product17.scala b/src/library/scala/Product17.scala index 078fc7c2bb..46f02abaa2 100644 --- a/src/library/scala/Product17.scala +++ b/src/library/scala/Product17.scala @@ -8,13 +8,11 @@ // $Id$ -// generated by genprod on Wed Jun 17 14:10:05 PDT 2009 +// generated by genprod on Wed Nov 04 18:46:21 CET 2009 package scala -import Predef._ - object Product17 { def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17](x: Product17[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17]): Option[Product17[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17]] = Some(x) diff --git a/src/library/scala/Product18.scala b/src/library/scala/Product18.scala index b1be449a70..481824c61f 100644 --- a/src/library/scala/Product18.scala +++ b/src/library/scala/Product18.scala @@ -8,13 +8,11 @@ // $Id$ -// generated by genprod on Wed Jun 17 14:10:05 PDT 2009 +// generated by genprod on Wed Nov 04 18:46:21 CET 2009 package scala -import Predef._ - object Product18 { def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18](x: Product18[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18]): Option[Product18[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18]] = Some(x) diff --git a/src/library/scala/Product19.scala b/src/library/scala/Product19.scala index cf164a8073..28db9c74ee 100644 --- a/src/library/scala/Product19.scala +++ b/src/library/scala/Product19.scala @@ -8,13 +8,11 @@ // $Id$ -// generated by genprod on Wed Jun 17 14:10:05 PDT 2009 +// generated by genprod on Wed Nov 04 18:46:21 CET 2009 package scala -import Predef._ - object Product19 { def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19](x: Product19[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19]): Option[Product19[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19]] = Some(x) diff --git a/src/library/scala/Product2.scala b/src/library/scala/Product2.scala index b489c6385e..81bde9495c 100644 --- a/src/library/scala/Product2.scala +++ b/src/library/scala/Product2.scala @@ -8,13 +8,11 @@ // $Id$ -// generated by genprod on Wed Jun 17 14:10:05 PDT 2009 +// generated by genprod on Wed Nov 04 18:46:21 CET 2009 package scala -import Predef._ - object Product2 { def unapply[T1, T2](x: Product2[T1, T2]): Option[Product2[T1, T2]] = Some(x) diff --git a/src/library/scala/Product20.scala b/src/library/scala/Product20.scala index 1c4bc98e2d..aa79b8d429 100644 --- a/src/library/scala/Product20.scala +++ b/src/library/scala/Product20.scala @@ -8,13 +8,11 @@ // $Id$ -// generated by genprod on Wed Jun 17 14:10:05 PDT 2009 +// generated by genprod on Wed Nov 04 18:46:21 CET 2009 package scala -import Predef._ - object Product20 { def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20](x: Product20[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20]): Option[Product20[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20]] = Some(x) diff --git a/src/library/scala/Product21.scala b/src/library/scala/Product21.scala index ca2fc3e8d0..fa4d2bb9e4 100644 --- a/src/library/scala/Product21.scala +++ b/src/library/scala/Product21.scala @@ -8,13 +8,11 @@ // $Id$ -// generated by genprod on Wed Jun 17 14:10:05 PDT 2009 +// generated by genprod on Wed Nov 04 18:46:21 CET 2009 package scala -import Predef._ - object Product21 { def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21](x: Product21[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21]): Option[Product21[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21]] = Some(x) diff --git a/src/library/scala/Product22.scala b/src/library/scala/Product22.scala index 19744ec5ba..57ee0ac4a2 100644 --- a/src/library/scala/Product22.scala +++ b/src/library/scala/Product22.scala @@ -8,13 +8,11 @@ // $Id$ -// generated by genprod on Wed Jun 17 14:10:05 PDT 2009 +// generated by genprod on Wed Nov 04 18:46:21 CET 2009 package scala -import Predef._ - object Product22 { def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22](x: Product22[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22]): Option[Product22[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22]] = Some(x) diff --git a/src/library/scala/Product3.scala b/src/library/scala/Product3.scala index 7ede6b88df..d26932773a 100644 --- a/src/library/scala/Product3.scala +++ b/src/library/scala/Product3.scala @@ -8,13 +8,11 @@ // $Id$ -// generated by genprod on Wed Jun 17 14:10:05 PDT 2009 +// generated by genprod on Wed Nov 04 18:46:21 CET 2009 package scala -import Predef._ - object Product3 { def unapply[T1, T2, T3](x: Product3[T1, T2, T3]): Option[Product3[T1, T2, T3]] = Some(x) diff --git a/src/library/scala/Product4.scala b/src/library/scala/Product4.scala index 99829ccd5e..074c6865d6 100644 --- a/src/library/scala/Product4.scala +++ b/src/library/scala/Product4.scala @@ -8,13 +8,11 @@ // $Id$ -// generated by genprod on Wed Jun 17 14:10:05 PDT 2009 +// generated by genprod on Wed Nov 04 18:46:21 CET 2009 package scala -import Predef._ - object Product4 { def unapply[T1, T2, T3, T4](x: Product4[T1, T2, T3, T4]): Option[Product4[T1, T2, T3, T4]] = Some(x) diff --git a/src/library/scala/Product5.scala b/src/library/scala/Product5.scala index 11fe65a356..96396bdc78 100644 --- a/src/library/scala/Product5.scala +++ b/src/library/scala/Product5.scala @@ -8,13 +8,11 @@ // $Id$ -// generated by genprod on Wed Jun 17 14:10:05 PDT 2009 +// generated by genprod on Wed Nov 04 18:46:21 CET 2009 package scala -import Predef._ - object Product5 { def unapply[T1, T2, T3, T4, T5](x: Product5[T1, T2, T3, T4, T5]): Option[Product5[T1, T2, T3, T4, T5]] = Some(x) diff --git a/src/library/scala/Product6.scala b/src/library/scala/Product6.scala index 38df1a333d..678a22254f 100644 --- a/src/library/scala/Product6.scala +++ b/src/library/scala/Product6.scala @@ -8,13 +8,11 @@ // $Id$ -// generated by genprod on Wed Jun 17 14:10:05 PDT 2009 +// generated by genprod on Wed Nov 04 18:46:21 CET 2009 package scala -import Predef._ - object Product6 { def unapply[T1, T2, T3, T4, T5, T6](x: Product6[T1, T2, T3, T4, T5, T6]): Option[Product6[T1, T2, T3, T4, T5, T6]] = Some(x) diff --git a/src/library/scala/Product7.scala b/src/library/scala/Product7.scala index dd8b2546b4..8885dccf77 100644 --- a/src/library/scala/Product7.scala +++ b/src/library/scala/Product7.scala @@ -8,13 +8,11 @@ // $Id$ -// generated by genprod on Wed Jun 17 14:10:05 PDT 2009 +// generated by genprod on Wed Nov 04 18:46:21 CET 2009 package scala -import Predef._ - object Product7 { def unapply[T1, T2, T3, T4, T5, T6, T7](x: Product7[T1, T2, T3, T4, T5, T6, T7]): Option[Product7[T1, T2, T3, T4, T5, T6, T7]] = Some(x) diff --git a/src/library/scala/Product8.scala b/src/library/scala/Product8.scala index d649163472..9150bf64b7 100644 --- a/src/library/scala/Product8.scala +++ b/src/library/scala/Product8.scala @@ -8,13 +8,11 @@ // $Id$ -// generated by genprod on Wed Jun 17 14:10:05 PDT 2009 +// generated by genprod on Wed Nov 04 18:46:21 CET 2009 package scala -import Predef._ - object Product8 { def unapply[T1, T2, T3, T4, T5, T6, T7, T8](x: Product8[T1, T2, T3, T4, T5, T6, T7, T8]): Option[Product8[T1, T2, T3, T4, T5, T6, T7, T8]] = Some(x) diff --git a/src/library/scala/Product9.scala b/src/library/scala/Product9.scala index 35a4b7e65e..2cdc08d8e4 100644 --- a/src/library/scala/Product9.scala +++ b/src/library/scala/Product9.scala @@ -8,13 +8,11 @@ // $Id$ -// generated by genprod on Wed Jun 17 14:10:05 PDT 2009 +// generated by genprod on Wed Nov 04 18:46:21 CET 2009 package scala -import Predef._ - object Product9 { def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9](x: Product9[T1, T2, T3, T4, T5, T6, T7, T8, T9]): Option[Product9[T1, T2, T3, T4, T5, T6, T7, T8, T9]] = Some(x) diff --git a/src/library/scala/Proxy.scala b/src/library/scala/Proxy.scala index 18b08d55a2..b8b48c7d81 100644 --- a/src/library/scala/Proxy.scala +++ b/src/library/scala/Proxy.scala @@ -12,8 +12,6 @@ package scala -import Predef._ - /** This class implements a simple proxy that forwards all calls to * methods of class <code>Any</code> to another object <code>self</code>. * Please note that only those methods can be forwarded that are diff --git a/src/library/scala/ScalaObject.scala b/src/library/scala/ScalaObject.scala index 91f74c1cc1..a7af5426eb 100644 --- a/src/library/scala/ScalaObject.scala +++ b/src/library/scala/ScalaObject.scala @@ -11,6 +11,4 @@ package scala -import Predef._ - -trait ScalaObject extends AnyRef +trait ScalaObject extends java.lang.Object diff --git a/src/library/scala/Tuple2.scala b/src/library/scala/Tuple2.scala index db499b3070..a7519bef77 100644 --- a/src/library/scala/Tuple2.scala +++ b/src/library/scala/Tuple2.scala @@ -13,7 +13,6 @@ package scala import annotation.unchecked.uncheckedVariance -import scala.collection.Traversable import scala.collection.generic.GenericTraversableTemplate import scala.collection.mutable.Builder diff --git a/src/library/scala/UninitializedError.scala b/src/library/scala/UninitializedError.scala index 37fcf61f32..00d4dbe4ba 100644 --- a/src/library/scala/UninitializedError.scala +++ b/src/library/scala/UninitializedError.scala @@ -11,8 +11,6 @@ package scala -import Predef._ - /** This class represents uninitialized variable/value errors. * * @author Martin Odersky diff --git a/src/library/scala/UninitializedFieldError.scala b/src/library/scala/UninitializedFieldError.scala index 0c68e2bbd6..97e5815b06 100644 --- a/src/library/scala/UninitializedFieldError.scala +++ b/src/library/scala/UninitializedFieldError.scala @@ -11,8 +11,6 @@ package scala -import Predef._ - /** This class implements errors which are thrown whenever a * field is used before it has been initialized. * diff --git a/src/library/scala/collection/immutable/Tree.scala.disabled b/src/library/scala/collection/immutable/Tree.scala.disabled index 18b0ced43d..1c1eb17acc 100644 --- a/src/library/scala/collection/immutable/Tree.scala.disabled +++ b/src/library/scala/collection/immutable/Tree.scala.disabled @@ -28,8 +28,6 @@ o/* __ *\ package scala.collection.immutable -//import Predef.NoSuchElementException - /** <p> * General Balanced Trees - highly efficient functional dictionaries. * </p> diff --git a/src/library/scala/collection/mutable/FlatHashTable.scala b/src/library/scala/collection/mutable/FlatHashTable.scala index c13d32aaba..1861953eec 100644 --- a/src/library/scala/collection/mutable/FlatHashTable.scala +++ b/src/library/scala/collection/mutable/FlatHashTable.scala @@ -11,8 +11,6 @@ package scala.collection package mutable -import Predef._ - /** * @since 2.3 */ diff --git a/src/library/scala/collection/mutable/LinkedHashMap.scala b/src/library/scala/collection/mutable/LinkedHashMap.scala index 22e9de381e..5c17ef1cfb 100644 --- a/src/library/scala/collection/mutable/LinkedHashMap.scala +++ b/src/library/scala/collection/mutable/LinkedHashMap.scala @@ -13,7 +13,6 @@ package scala.collection package mutable import generic._ -import Predef._ /** This class implements mutable maps using a hashtable. * diff --git a/src/library/scala/collection/mutable/WrappedArray.scala b/src/library/scala/collection/mutable/WrappedArray.scala index 957f1c56d4..a0f8109a9b 100644 --- a/src/library/scala/collection/mutable/WrappedArray.scala +++ b/src/library/scala/collection/mutable/WrappedArray.scala @@ -12,7 +12,6 @@ package scala.collection package mutable -import Predef._ import scala.reflect.ClassManifest import scala.collection.generic._ diff --git a/src/library/scala/collection/script/Message.scala b/src/library/scala/collection/script/Message.scala index 5a06289fc1..4e9db2fc41 100644 --- a/src/library/scala/collection/script/Message.scala +++ b/src/library/scala/collection/script/Message.scala @@ -12,7 +12,6 @@ package scala.collection package script -import Predef._ import mutable.ArrayBuffer /** Class <code>Message</code> represents messages that are issued by observable diff --git a/src/library/scala/compat/Platform.scala b/src/library/scala/compat/Platform.scala index 9bbfba25bc..6bae0bccb7 100644 --- a/src/library/scala/compat/Platform.scala +++ b/src/library/scala/compat/Platform.scala @@ -12,7 +12,6 @@ package scala.compat import java.lang.System -import Predef._ object Platform { diff --git a/src/library/scala/reflect/Code.scala b/src/library/scala/reflect/Code.scala index a19eedfe3f..a61d86babb 100644 --- a/src/library/scala/reflect/Code.scala +++ b/src/library/scala/reflect/Code.scala @@ -11,8 +11,6 @@ package scala.reflect -import Predef.Error - /** This type is required by the compiler and <b>should not be used in client code</b>. */ class Code[Type](val tree: Tree) diff --git a/src/library/scala/reflect/Symbol.scala b/src/library/scala/reflect/Symbol.scala index dd0923aaf3..d9aa4a428d 100644 --- a/src/library/scala/reflect/Symbol.scala +++ b/src/library/scala/reflect/Symbol.scala @@ -11,8 +11,6 @@ package scala.reflect -import Predef._ - /** This type is required by the compiler and <b>should not be used in client code</b>. */ abstract class Symbol { val owner: Symbol diff --git a/src/library/scala/reflect/Type.scala b/src/library/scala/reflect/Type.scala index d60388ebe6..815824a864 100644 --- a/src/library/scala/reflect/Type.scala +++ b/src/library/scala/reflect/Type.scala @@ -12,7 +12,6 @@ package scala.reflect import collection.immutable.List -import Predef._ /** This type is required by the compiler and <b>should not be used in client code</b>. */ abstract class Type diff --git a/src/library/scala/runtime/BoxedArray.scala b/src/library/scala/runtime/BoxedArray.scala index 2db7ee15dc..0a8659ffe6 100644 --- a/src/library/scala/runtime/BoxedArray.scala +++ b/src/library/scala/runtime/BoxedArray.scala @@ -11,7 +11,6 @@ package scala.runtime -import Predef._ import scala.reflect.ClassManifest import collection.mutable._ import collection.Seq diff --git a/src/library/scala/runtime/BoxedObjectArray.scala b/src/library/scala/runtime/BoxedObjectArray.scala index b2f3380417..47ad9a3b48 100644 --- a/src/library/scala/runtime/BoxedObjectArray.scala +++ b/src/library/scala/runtime/BoxedObjectArray.scala @@ -12,8 +12,6 @@ package scala.runtime import scala.reflect.ClassManifest -import Predef._ - @serializable final class BoxedObjectArray[A <: AnyRef](val value: Array[AnyRef], val elemManifest: ClassManifest[A]) extends BoxedArray[A] { diff --git a/src/library/scala/runtime/MethodCache.scala b/src/library/scala/runtime/MethodCache.scala index b217b66073..b4c31f9938 100644 --- a/src/library/scala/runtime/MethodCache.scala +++ b/src/library/scala/runtime/MethodCache.scala @@ -11,8 +11,6 @@ package scala.runtime - -import Predef._ import java.lang.reflect.{ Method => JMethod } import java.lang.{ Class => JClass } diff --git a/src/library/scala/runtime/NonLocalReturnException.scala b/src/library/scala/runtime/NonLocalReturnException.scala index 855ae34387..46e5771dd1 100644 --- a/src/library/scala/runtime/NonLocalReturnException.scala +++ b/src/library/scala/runtime/NonLocalReturnException.scala @@ -11,7 +11,6 @@ package scala.runtime -import Predef.RuntimeException import scala.util.control.ControlException class NonLocalReturnException[T](val key: AnyRef, val value: T) extends RuntimeException with ControlException diff --git a/src/library/scala/runtime/RichChar.scala b/src/library/scala/runtime/RichChar.scala index ba32491456..99c664b7a1 100644 --- a/src/library/scala/runtime/RichChar.scala +++ b/src/library/scala/runtime/RichChar.scala @@ -13,7 +13,6 @@ package scala.runtime import java.lang.Character import collection.{IndexedSeq, IndexedSeqView} -import Predef.{require, NoSuchElementException} /** <p> * For example, in the following code diff --git a/src/library/scala/runtime/RichException.scala b/src/library/scala/runtime/RichException.scala index 82035ea605..27b3c719c6 100644 --- a/src/library/scala/runtime/RichException.scala +++ b/src/library/scala/runtime/RichException.scala @@ -11,7 +11,6 @@ package scala.runtime -import Predef._ import compat.Platform.EOL final class RichException(exc: Throwable) { diff --git a/src/library/scala/runtime/RichFloat.scala b/src/library/scala/runtime/RichFloat.scala index 08c6c204c6..ac47dcc934 100644 --- a/src/library/scala/runtime/RichFloat.scala +++ b/src/library/scala/runtime/RichFloat.scala @@ -12,8 +12,6 @@ package scala.runtime -import Predef._ - final class RichFloat(x: Float) extends Proxy with Ordered[Float] { // Proxy.self diff --git a/src/library/scala/runtime/StringAdd.scala b/src/library/scala/runtime/StringAdd.scala index 7a0d54ec36..c8f22a8fdb 100644 --- a/src/library/scala/runtime/StringAdd.scala +++ b/src/library/scala/runtime/StringAdd.scala @@ -12,8 +12,6 @@ package scala.runtime -import Predef._ - final class StringAdd(self: Any) { def +(other: String) = String.valueOf(self) + other diff --git a/src/library/scala/throws.scala b/src/library/scala/throws.scala index 201aa4798a..34728a094c 100644 --- a/src/library/scala/throws.scala +++ b/src/library/scala/throws.scala @@ -11,8 +11,6 @@ package scala -import Predef._ - /** <p> * Annotation for specifying the exceptions thrown by a method. * For example: diff --git a/src/library/scala/util/DynamicVariable.scala b/src/library/scala/util/DynamicVariable.scala index 2afaaf2303..51d017888a 100644 --- a/src/library/scala/util/DynamicVariable.scala +++ b/src/library/scala/util/DynamicVariable.scala @@ -12,7 +12,6 @@ package scala.util -import Predef._ import java.lang.InheritableThreadLocal /** <p> diff --git a/src/library/scala/xml/NamespaceBinding.scala b/src/library/scala/xml/NamespaceBinding.scala index 6bd339aab3..93485a17fe 100644 --- a/src/library/scala/xml/NamespaceBinding.scala +++ b/src/library/scala/xml/NamespaceBinding.scala @@ -11,7 +11,6 @@ package scala.xml -import Predef._ import Utility.sbToString import collection.mutable.StringBuilder diff --git a/src/library/scala/xml/TopScope.scala b/src/library/scala/xml/TopScope.scala index b2b2cdfb1e..c458248ae3 100644 --- a/src/library/scala/xml/TopScope.scala +++ b/src/library/scala/xml/TopScope.scala @@ -10,7 +10,6 @@ package scala.xml -import Predef._ import collection.mutable.StringBuilder diff --git a/src/library/scala/xml/XML.scala b/src/library/scala/xml/XML.scala index 0c3ea5e295..afe7354106 100644 --- a/src/library/scala/xml/XML.scala +++ b/src/library/scala/xml/XML.scala @@ -11,7 +11,6 @@ package scala.xml -import Predef._ import scala.xml.parsing.NoBindingFactoryAdapter import scala.xml.factory.XMLLoader import org.xml.sax.InputSource |