diff options
17 files changed, 92 insertions, 119 deletions
@@ -276,7 +276,7 @@ INITIALISATION <pathelement location="${build-strap.dir}/classes/library"/> <pathelement location="${lib.dir}/forkjoin.jar"/> <path refid="lib.extra"/> - </path> + </path> <taskdef resource="scala/tools/ant/sabbus/antlib.xml" classpathref="starr.classpath"/> </target> @@ -289,7 +289,7 @@ LOCAL REFERENCE BUILD (LOCKER) <available file="${build-locker.dir}/all.complete"/> </condition> </target> - + <target name="locker.pre-lib" depends="locker.start" unless="locker.available"> <condition property="locker.lib.needed"> <not><available file="${build-locker.dir}/library.complete"/></not> @@ -591,8 +591,8 @@ QUICK BUILD (QUICK) <include name="**/*.properties"/> <include name="**/*.swf"/> <include name="**/*.png"/> - <include name="**/*.gif"/> - <include name="**/*.txt"/> + <include name="**/*.gif"/> + <include name="**/*.txt"/> </fileset> </copy> <touch file="${build-quick.dir}/compiler.complete" verbose="no"/> @@ -1104,7 +1104,7 @@ BOOTSTRAPPING BUILD (STRAP) <include name="**/*.properties"/> <include name="**/*.swf"/> <include name="**/*.png"/> - <include name="**/*.gif"/> + <include name="**/*.gif"/> <include name="**/*.txt"/> </fileset> </copy> @@ -1617,12 +1617,12 @@ BOOTRAPING TEST AND TEST SUITE <!-- =========================================================================== DISTRIBUTION ============================================================================ --> - + <target name="dist.start" depends="docs.done, pack.done"> <property name="dist.name" value="scala-${version.number}"/> <property name="dist.dir" value="${dists.dir}/${dist.name}"/> </target> - + <target name="dist.base" depends="dist.start"> <mkdir dir="${dist.dir}/lib"/> <copy toDir="${dist.dir}/lib"> @@ -1864,7 +1864,7 @@ POSITIONS <param name="test.tests.srcs" value="${partest.dir}/files/neg"/> </antcall> </target> - + <target name="test.positions.sub"> <echo message="Validating positions for: ${test.srcs}"/> <if> @@ -1907,7 +1907,7 @@ POSITIONS </path> </foreach> </target> - + <!-- =========================================================================== MISCELLANEOUS ============================================================================ --> diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala index b06ecdb859..07aebb6f32 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala @@ -118,7 +118,7 @@ trait ParsersCommon extends ScannersCommon { * </li> * </ol> */ -trait Parsers extends Scanners with MarkupParsers with ParsersCommon { +trait Parsers extends Scanners /*@XML*/ with MarkupParsers /*XML@*/ with ParsersCommon { self => val global: Global import global._ @@ -158,6 +158,7 @@ self => def incompleteInputError(msg: String): Unit = throw new MalformedInput(source.content.length - 1, msg) /** the markup parser */ +/*@XML*/ lazy val xmlp = new MarkupParser(this, true) object symbXMLBuilder extends SymbolicXMLBuilder(this, true) { // DEBUG choices @@ -167,6 +168,7 @@ self => def xmlLiteral : Tree = xmlp.xLiteral def xmlLiteralPattern : Tree = xmlp.xLiteralPattern +/*XML@*/ } class OutlineParser(source: SourceFile) extends SourceFileParser(source) { @@ -175,12 +177,16 @@ self => accept(LBRACE) var openBraces = 1 while (in.token != EOF && openBraces > 0) { + /*@XML*/ if (in.token == XMLSTART) xmlLiteral() else { + /*XML@*/ if (in.token == LBRACE) openBraces += 1 else if (in.token == RBRACE) openBraces -= 1 in.nextToken() + /*@XML*/ } + /*XML@*/ } body } @@ -624,7 +630,7 @@ self => def isExprIntroToken(token: Int): Boolean = isLiteralToken(token) || (token match { case IDENTIFIER | BACKQUOTED_IDENT | THIS | SUPER | IF | FOR | NEW | USCORE | TRY | WHILE | - DO | RETURN | THROW | LPAREN | LBRACE | XMLSTART => true + DO | RETURN | THROW | LPAREN | LBRACE /*@XML*/| XMLSTART /*XML@*/ => true case _ => false }) @@ -1383,6 +1389,7 @@ self => * Expr ::= implicit Id => Expr * }}} */ + def implicitClosure(start: Int, location: Int): Tree = { val param0 = convertToParam { atPos(in.offset) { @@ -1448,7 +1455,9 @@ self => } else simpleExpr() } + /*@XML*/ def xmlLiteral(): Tree + /*XML@*/ /** {{{ * SimpleExpr ::= new (ClassTemplate | TemplateBody) @@ -1468,8 +1477,10 @@ self => val t = if (isLiteral) atPos(in.offset)(literal(false)) else in.token match { + /*@XML*/ case XMLSTART => xmlLiteral() + /*XML@*/ case IDENTIFIER | BACKQUOTED_IDENT | THIS | SUPER => path(true, false) case USCORE => @@ -1815,8 +1826,10 @@ self => atPos(start) { literal(false) } case LPAREN => atPos(start)(makeParens(noSeq.patterns())) + /*@XML*/ case XMLSTART => xmlLiteralPattern() + /*XML@*/ case _ => syntaxErrorOrIncomplete("illegal start of simple pattern", true) errorPatternTree @@ -1858,7 +1871,9 @@ self => if (in.token == RPAREN) Nil else seqPatterns() } + /*@XML*/ def xmlLiteralPattern(): Tree + /*XML@*/ /* -------- MODIFIERS and ANNOTATIONS ------------------------------------------- */ @@ -1879,7 +1894,8 @@ self => (mods | mod) withPosition (mod, pos) } - private def tokenRange(token: TokenData) = r2p(token.offset, token.offset, token.offset + token.name.length - 1) + private def tokenRange(token: TokenData) = + r2p(token.offset, token.offset, token.offset + token.name.length - 1) /** {{{ * AccessQualifier ::= `[' (Id | this) `]' diff --git a/src/compiler/scala/tools/nsc/ast/parser/SymbolicXMLBuilder.scala b/src/compiler/scala/tools/nsc/ast/parser/SymbolicXMLBuilder.scala index aa862653d6..b8fa55447a 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/SymbolicXMLBuilder.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/SymbolicXMLBuilder.scala @@ -12,12 +12,13 @@ import xml.XML.{ xmlns } import symtab.Flags.MUTABLE import scala.tools.util.StringOps.splitWhere -/** This class builds instance of <code>Tree</code> that represent XML. +/** This class builds instance of `Tree` that represent XML. * - * Note from martin: This needs to have its position info reworked. I don't understand exactly - * what's done here. To make validation pass, I set many positions to be transparent. Not sure this - * is a good idea for navigating XML trees in the IDE< but it's the best I can do right now. If someone - * who understands this part better wants to give it a shot, please do! + * Note from martin: This needs to have its position info reworked. I don't + * understand exactly what's done here. To make validation pass, I set many + * positions to be transparent. Not sure this is a good idea for navigating + * XML trees in the IDE but it's the best I can do right now. If someone + * who understands this part better wants to give it a shot, please do! * * @author Burak Emir * @version 1.0 @@ -26,9 +27,9 @@ abstract class SymbolicXMLBuilder(p: Parsers#Parser, preserveWS: Boolean) { val global: Global import global._ - var isPattern: Boolean = _ + private[parser] var isPattern: Boolean = _ - trait XMLTypeNames extends TypeNames { + private trait XMLTypeNames extends TypeNames { val _Comment: NameType = "Comment" val _Elem: NameType = "Elem" val _EntityRef: NameType = "EntityRef" @@ -43,7 +44,7 @@ abstract class SymbolicXMLBuilder(p: Parsers#Parser, preserveWS: Boolean) { val _UnprefixedAttribute: NameType = "UnprefixedAttribute" } - trait XMLTermNames extends TermNames { + private trait XMLTermNames extends TermNames { val _Null: NameType = "Null" val __Elem: NameType = "Elem" val __Text: NameType = "Text" diff --git a/src/library/scala/collection/generic/CanCombineFrom.scala b/src/library/scala/collection/generic/CanCombineFrom.scala index ad2381a571..676036cf90 100644 --- a/src/library/scala/collection/generic/CanCombineFrom.scala +++ b/src/library/scala/collection/generic/CanCombineFrom.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2011, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2010-2011, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -11,22 +11,16 @@ package generic import scala.collection.parallel._ -/** - * A base trait for parallel builder factories. +/** A base trait for parallel builder factories. * - * @tparam From the type of the underlying collection that requests a builder to be created - * @tparam Elem the element type of the collection to be created - * @tparam To the type of the collection to be created + * @tparam From the type of the underlying collection that requests a + * builder to be created. + * @tparam Elem the element type of the collection to be created. + * @tparam To the type of the collection to be created. + * @since 2.8 */ trait CanCombineFrom[-From, -Elem, +To] extends CanBuildFrom[From, Elem, To] with Parallel { def apply(from: From): Combiner[Elem, To] def apply(): Combiner[Elem, To] } - - - - - - - diff --git a/src/library/scala/collection/generic/ClassManifestTraversableFactory.scala b/src/library/scala/collection/generic/ClassManifestTraversableFactory.scala index 82270d5728..e54ce9cdbf 100644 --- a/src/library/scala/collection/generic/ClassManifestTraversableFactory.scala +++ b/src/library/scala/collection/generic/ClassManifestTraversableFactory.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2006-2011, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2010-2011, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -9,6 +9,16 @@ package scala.collection package generic +/** A template for companion objects of `ClassManifestTraversable` and + * subclasses thereof. + * + * @define coll collection + * @define Coll Traversable + * @define genericCanBuildFromInfo + * The standard `CanBuildFrom` instance for $Coll objects. + * @author Aleksandar Prokopec + * @since 2.8 + */ abstract class ClassManifestTraversableFactory[CC[X] <: Traversable[X] with GenericClassManifestTraversableTemplate[X, CC]] extends GenericClassManifestCompanion[CC] { diff --git a/src/library/scala/collection/generic/GenMapFactory.scala b/src/library/scala/collection/generic/GenMapFactory.scala index f3537e8c6b..d6f6978ead 100644 --- a/src/library/scala/collection/generic/GenMapFactory.scala +++ b/src/library/scala/collection/generic/GenMapFactory.scala @@ -9,10 +9,8 @@ package scala.collection package generic - import mutable.{Builder, MapBuilder} - /** A template for companion objects of `Map` and subclasses thereof. * * @define coll map diff --git a/src/library/scala/collection/generic/GenericClassManifestTraversableTemplate.scala b/src/library/scala/collection/generic/GenericClassManifestTraversableTemplate.scala index 03d426946b..12b5a495f0 100644 --- a/src/library/scala/collection/generic/GenericClassManifestTraversableTemplate.scala +++ b/src/library/scala/collection/generic/GenericClassManifestTraversableTemplate.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2011, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2010-2011, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -16,6 +16,7 @@ import annotation.unchecked.uncheckedVariance * manifests for their element types. * * @author Aleksandar Prokopec + * @since 2.8 */ trait GenericClassManifestTraversableTemplate[+A, +CC[X] <: Traversable[X]] extends HasNewBuilder[A, CC[A] @uncheckedVariance] { implicit protected[this] val manifest: ClassManifest[A] diff --git a/src/library/scala/collection/generic/GenericOrderedCompanion.scala b/src/library/scala/collection/generic/GenericOrderedCompanion.scala index c0656dd01a..c3baa28147 100644 --- a/src/library/scala/collection/generic/GenericOrderedCompanion.scala +++ b/src/library/scala/collection/generic/GenericOrderedCompanion.scala @@ -1,26 +1,21 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2011, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2010-2011, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ - - package scala.collection package generic import mutable.Builder - - - - /** This class represents companions of classes which require the ordered trait * for their element types. * * @author Aleksandar Prokopec + * @since 2.8 */ abstract class GenericOrderedCompanion[+CC[X] <: Traversable[X]] { type Coll = CC[_] diff --git a/src/library/scala/collection/generic/GenericParCompanion.scala b/src/library/scala/collection/generic/GenericParCompanion.scala index 783a4878f6..40fcfa31d0 100644 --- a/src/library/scala/collection/generic/GenericParCompanion.scala +++ b/src/library/scala/collection/generic/GenericParCompanion.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2011, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2010-2011, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -33,5 +33,3 @@ trait GenericParMapCompanion[+CC[P, Q] <: ParMap[P, Q]] { def newCombiner[P, Q]: Combiner[(P, Q), CC[P, Q]] } - - diff --git a/src/library/scala/collection/generic/GenericParTemplate.scala b/src/library/scala/collection/generic/GenericParTemplate.scala index 1e3f7b5e40..430dcb9e29 100644 --- a/src/library/scala/collection/generic/GenericParTemplate.scala +++ b/src/library/scala/collection/generic/GenericParTemplate.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2011, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2010-2011, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -8,27 +8,19 @@ package scala.collection.generic - - import scala.collection.parallel.Combiner import scala.collection.parallel.ParIterable import scala.collection.parallel.ParMap import scala.collection.parallel.TaskSupport - import annotation.unchecked.uncheckedVariance - - - - - /** A template trait for collections having a companion. * * @tparam A the element type of the collection * @tparam CC the type constructor representing the collection class + * @author Aleksandar Prokopec * @since 2.8 - * @author prokopec */ trait GenericParTemplate[+A, +CC[X] <: ParIterable[X]] extends GenericTraversableTemplate[A, CC] @@ -68,8 +60,3 @@ trait GenericParMapTemplate[K, +V, +CC[X, Y] <: ParMap[X, Y]] extends GenericPar } } - - - - - diff --git a/src/library/scala/collection/generic/GenericSetTemplate.scala b/src/library/scala/collection/generic/GenericSetTemplate.scala index 9e1a04179b..6af6a36981 100644 --- a/src/library/scala/collection/generic/GenericSetTemplate.scala +++ b/src/library/scala/collection/generic/GenericSetTemplate.scala @@ -6,8 +6,6 @@ ** |/ ** \* */ - - package scala.collection package generic diff --git a/src/library/scala/collection/generic/HasNewCombiner.scala b/src/library/scala/collection/generic/HasNewCombiner.scala index cc69faa270..a7a9ab9204 100644 --- a/src/library/scala/collection/generic/HasNewCombiner.scala +++ b/src/library/scala/collection/generic/HasNewCombiner.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2011, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2010-2011, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -8,28 +8,12 @@ package scala.collection.generic - - import scala.collection.parallel.Combiner - - +/** + * @since 2.8 + */ trait HasNewCombiner[+T, +Repr] { protected[this] def newCombiner: Combiner[T, Repr] } - - - - - - - - - - - - - - - diff --git a/src/library/scala/collection/generic/ParFactory.scala b/src/library/scala/collection/generic/ParFactory.scala index 637a1dca6a..558024d45c 100644 --- a/src/library/scala/collection/generic/ParFactory.scala +++ b/src/library/scala/collection/generic/ParFactory.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2011, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2010-2011, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -8,17 +8,16 @@ package scala.collection.generic - import scala.collection.parallel.ParIterable import scala.collection.parallel.Combiner - - -/** A template class for companion objects of `ParIterable` and subclasses thereof. - * This class extends `TraversableFactory` and provides a set of operations to create `$Coll` objects. +/** A template class for companion objects of `ParIterable` and subclasses + * thereof. This class extends `TraversableFactory` and provides a set of + * operations to create `$Coll` objects. * * @define coll parallel collection * @define Coll ParIterable + * @since 2.8 */ abstract class ParFactory[CC[X] <: ParIterable[X] with GenericParTemplate[X, CC]] extends GenTraversableFactory[CC] @@ -26,10 +25,9 @@ extends GenTraversableFactory[CC] //type EPC[T, C] = collection.parallel.EnvironmentPassingCombiner[T, C] - /** - * A generic implementation of the `CanCombineFrom` trait, which forwards all calls to - * `apply(from)` to the `genericParBuilder` method of the $coll `from`, and calls to `apply()` - * to this factory. + /** A generic implementation of the `CanCombineFrom` trait, which forwards + * all calls to `apply(from)` to the `genericParBuilder` method of the $coll + * `from`, and calls to `apply()` to this factory. */ class GenericCanCombineFrom[A] extends GenericCanBuildFrom[A] with CanCombineFrom[CC[_], A, CC[A]] { override def apply(from: Coll) = from.genericCombiner @@ -41,10 +39,3 @@ extends GenTraversableFactory[CC] - - - - - - - diff --git a/src/library/scala/collection/generic/ParMapFactory.scala b/src/library/scala/collection/generic/ParMapFactory.scala index 06105c9756..2d89f79c13 100644 --- a/src/library/scala/collection/generic/ParMapFactory.scala +++ b/src/library/scala/collection/generic/ParMapFactory.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2011, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2010-2011, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -14,10 +14,13 @@ import scala.collection.parallel.Combiner import scala.collection.mutable.Builder /** A template class for companion objects of `ParMap` and subclasses thereof. - * This class extends `TraversableFactory` and provides a set of operations to create `$Coll` objects. + * This class extends `TraversableFactory` and provides a set of operations + * to create `$Coll` objects. * * @define coll parallel map * @define Coll ParMap + * @author Aleksandar Prokopec + * @since 2.8 */ abstract class ParMapFactory[CC[X, Y] <: ParMap[X, Y] with ParMapLike[X, Y, CC[X, Y], _]] extends GenMapFactory[CC] diff --git a/src/library/scala/collection/generic/ParSetFactory.scala b/src/library/scala/collection/generic/ParSetFactory.scala index 221e893593..c2cf971d73 100644 --- a/src/library/scala/collection/generic/ParSetFactory.scala +++ b/src/library/scala/collection/generic/ParSetFactory.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2011, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2010-2011, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -8,20 +8,15 @@ package scala.collection.generic - - - - import collection.mutable.Builder import collection.parallel.Combiner import collection.parallel.ParSet import collection.parallel.ParSetLike - - - - - +/** + * @author Aleksandar Prokopec + * @since 2.8 + */ abstract class ParSetFactory[CC[X] <: ParSet[X] with ParSetLike[X, CC[X], _] with GenericParTemplate[X, CC]] extends GenSetFactory[CC] with GenericParCompanion[CC] @@ -36,7 +31,3 @@ abstract class ParSetFactory[CC[X] <: ParSet[X] with ParSetLike[X, CC[X], _] wit } } - - - - diff --git a/src/library/scala/collection/generic/Sizing.scala b/src/library/scala/collection/generic/Sizing.scala index 17181dc9dd..f0a90a6466 100644 --- a/src/library/scala/collection/generic/Sizing.scala +++ b/src/library/scala/collection/generic/Sizing.scala @@ -1,3 +1,11 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2010-2011, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + package scala.collection.generic /** A trait for objects which have a size. diff --git a/src/library/scala/collection/mutable/UnrolledBuffer.scala b/src/library/scala/collection/mutable/UnrolledBuffer.scala index 442d50c6ea..d4185b736d 100644 --- a/src/library/scala/collection/mutable/UnrolledBuffer.scala +++ b/src/library/scala/collection/mutable/UnrolledBuffer.scala @@ -6,8 +6,6 @@ ** |/ ** \* */ - - package scala.collection.mutable import collection.Iterator |