diff options
| author | Martin Odersky <odersky@gmail.com> | 2009-07-24 15:28:37 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2009-07-24 15:28:37 +0000 |
| commit | 40707e0f49eb991ba1cbc07bdb1bcf65a640006b (patch) | |
| tree | 00b6b70e32b941f9aa4502a91ad07fd0fc807e3d /src | |
| parent | 8a78d3748319811d7b0adc80d4ee8926dc8d90bf (diff) | |
| download | scala-40707e0f49eb991ba1cbc07bdb1bcf65a640006b.tar.gz scala-40707e0f49eb991ba1cbc07bdb1bcf65a640006b.tar.bz2 scala-40707e0f49eb991ba1cbc07bdb1bcf65a640006b.zip | |
switch to unnested packages.
Diffstat (limited to 'src')
495 files changed, 1140 insertions, 627 deletions
diff --git a/src/actors/scala/actors/remote/FreshNameCreator.scala b/src/actors/scala/actors/remote/FreshNameCreator.scala index 46ec1b3cc1..9be6d06b5b 100644 --- a/src/actors/scala/actors/remote/FreshNameCreator.scala +++ b/src/actors/scala/actors/remote/FreshNameCreator.scala @@ -8,7 +8,8 @@ // $Id$ -package scala.actors.remote +package scala.actors +package remote object FreshNameCreator { diff --git a/src/actors/scala/actors/remote/JavaSerializer.scala b/src/actors/scala/actors/remote/JavaSerializer.scala index 42b7000f9d..4e8073055e 100644 --- a/src/actors/scala/actors/remote/JavaSerializer.scala +++ b/src/actors/scala/actors/remote/JavaSerializer.scala @@ -8,7 +8,8 @@ // $Id$ -package scala.actors.remote +package scala.actors +package remote import java.io.{ByteArrayInputStream, ByteArrayOutputStream, ObjectInputStream, ObjectOutputStream, InputStream, diff --git a/src/actors/scala/actors/remote/NetKernel.scala b/src/actors/scala/actors/remote/NetKernel.scala index b7376a4b46..e6440f67ec 100644 --- a/src/actors/scala/actors/remote/NetKernel.scala +++ b/src/actors/scala/actors/remote/NetKernel.scala @@ -8,7 +8,8 @@ // $Id$ -package scala.actors.remote +package scala.actors +package remote import scala.collection.mutable.{HashMap, HashSet} diff --git a/src/actors/scala/actors/remote/Proxy.scala b/src/actors/scala/actors/remote/Proxy.scala index dca3c55bdb..d99a8d3c1c 100644 --- a/src/actors/scala/actors/remote/Proxy.scala +++ b/src/actors/scala/actors/remote/Proxy.scala @@ -8,7 +8,8 @@ // $Id$ -package scala.actors.remote +package scala.actors +package remote import scala.collection.mutable.HashMap diff --git a/src/actors/scala/actors/remote/RemoteActor.scala b/src/actors/scala/actors/remote/RemoteActor.scala index f699515add..eef18ca471 100644 --- a/src/actors/scala/actors/remote/RemoteActor.scala +++ b/src/actors/scala/actors/remote/RemoteActor.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.actors.remote +package scala.actors +package remote /** <p> diff --git a/src/actors/scala/actors/remote/Serializer.scala b/src/actors/scala/actors/remote/Serializer.scala index 0d5ee1bf34..fe3ddb0fae 100644 --- a/src/actors/scala/actors/remote/Serializer.scala +++ b/src/actors/scala/actors/remote/Serializer.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.actors.remote +package scala.actors +package remote import java.lang.ClassNotFoundException diff --git a/src/actors/scala/actors/remote/Service.scala b/src/actors/scala/actors/remote/Service.scala index d7456b6b07..86891b3987 100644 --- a/src/actors/scala/actors/remote/Service.scala +++ b/src/actors/scala/actors/remote/Service.scala @@ -8,7 +8,8 @@ // $Id$ -package scala.actors.remote +package scala.actors +package remote /** * @version 0.9.10 diff --git a/src/actors/scala/actors/remote/TcpService.scala b/src/actors/scala/actors/remote/TcpService.scala index e41ab94446..d9b71498cd 100644 --- a/src/actors/scala/actors/remote/TcpService.scala +++ b/src/actors/scala/actors/remote/TcpService.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.actors.remote +package scala.actors +package remote import java.io.{DataInputStream, DataOutputStream, IOException} diff --git a/src/compiler/scala/tools/ant/FastScalac.scala b/src/compiler/scala/tools/ant/FastScalac.scala index 581bdb7ea6..1aca0b3c81 100644 --- a/src/compiler/scala/tools/ant/FastScalac.scala +++ b/src/compiler/scala/tools/ant/FastScalac.scala @@ -93,7 +93,7 @@ class FastScalac extends Scalac { val args = (cmdOptions ::: (sourceFiles map (_.toString))).toArray try { - if(nsc.CompileClient.main0(args) > 0 && failonerror) + if (scala.tools.nsc.CompileClient.main0(args) > 0 && failonerror) error("Compile failed; see the compiler error output for details.") } catch { diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala index c4ce109946..e842c96641 100644 --- a/src/compiler/scala/tools/nsc/Global.scala +++ b/src/compiler/scala/tools/nsc/Global.scala @@ -146,7 +146,7 @@ class Global(var settings: Settings, var reporter: Reporter) extends SymbolTable // ------------------ Reporting ------------------------------------- - import nsc.util.NoPosition + import util.NoPosition def error(msg: String) = reporter.error(NoPosition, msg) def warning(msg: String) = reporter.warning(NoPosition, msg) def inform(msg: String) = Console.err.println(msg) diff --git a/src/compiler/scala/tools/nsc/Interpreter.scala b/src/compiler/scala/tools/nsc/Interpreter.scala index b41f577f84..b32dc796da 100644 --- a/src/compiler/scala/tools/nsc/Interpreter.scala +++ b/src/compiler/scala/tools/nsc/Interpreter.scala @@ -23,8 +23,8 @@ import reporters.{ ConsoleReporter, Reporter } import symtab.{ Flags, Names } import util.{ SourceFile, BatchSourceFile, ClassPath } import scala.util.NameTransformer -import nsc.{ InterpreterResults => IR } -import nsc.interpreter._ +import scala.tools.nsc.{ InterpreterResults => IR } +import interpreter._ import Interpreter._ /** <p> diff --git a/src/compiler/scala/tools/nsc/ast/NodePrinters.scala b/src/compiler/scala/tools/nsc/ast/NodePrinters.scala index bf7a890524..6d4d5f99fd 100644 --- a/src/compiler/scala/tools/nsc/ast/NodePrinters.scala +++ b/src/compiler/scala/tools/nsc/ast/NodePrinters.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.ast +package scala.tools.nsc +package ast import compat.Platform.EOL import symtab.Flags._ @@ -317,8 +318,10 @@ abstract class NodePrinters { traverse(tpt, level + 1, true) traverse(rhs, level + 1, false) printcln(")") - case PackageDef(name, stats) => - println("PackageDef("+name+", ") + case PackageDef(pid, stats) => + println("PackageDef(") + traverse(pid, level + 1, false) + println(",\n") for (stat <- stats) traverse(stat, level + 1, false) printcln(")") diff --git a/src/compiler/scala/tools/nsc/ast/TreeBrowsers.scala b/src/compiler/scala/tools/nsc/ast/TreeBrowsers.scala index af9a45fde5..eb46e93d73 100644 --- a/src/compiler/scala/tools/nsc/ast/TreeBrowsers.scala +++ b/src/compiler/scala/tools/nsc/ast/TreeBrowsers.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.ast +package scala.tools.nsc +package ast import java.awt.{List => awtList, _} import java.awt.event._ @@ -412,7 +413,7 @@ abstract class TreeBrowsers { mods.annotations ::: impl :: children } - case PackageDef(name, stats) => + case PackageDef(pid, stats) => stats case ModuleDef(mods, name, impl) => diff --git a/src/compiler/scala/tools/nsc/ast/TreeDSL.scala b/src/compiler/scala/tools/nsc/ast/TreeDSL.scala index 97869d5ea5..253994744b 100644 --- a/src/compiler/scala/tools/nsc/ast/TreeDSL.scala +++ b/src/compiler/scala/tools/nsc/ast/TreeDSL.scala @@ -4,7 +4,8 @@ * @author Paul Phillips */ -package scala.tools.nsc.ast +package scala.tools.nsc +package ast /** A DSL for generating scala code. The goal is that the * code generating code should look a lot like the code it @@ -244,4 +245,4 @@ trait TreeDSL { implicit def mkTreeFromSelectStart(ss: SelectStart): Select = ss.tree implicit def mkTreeMethodsFromSelectStart(ss: SelectStart): TreeMethods = mkTreeMethods(ss.tree) } -}
\ No newline at end of file +} diff --git a/src/compiler/scala/tools/nsc/ast/TreeGen.scala b/src/compiler/scala/tools/nsc/ast/TreeGen.scala index 5c4d7c1c37..2baf578914 100644 --- a/src/compiler/scala/tools/nsc/ast/TreeGen.scala +++ b/src/compiler/scala/tools/nsc/ast/TreeGen.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.ast +package scala.tools.nsc +package ast import scala.collection.mutable.ListBuffer import symtab.Flags._ diff --git a/src/compiler/scala/tools/nsc/ast/TreeInfo.scala b/src/compiler/scala/tools/nsc/ast/TreeInfo.scala index 3eb6dc321b..5e1a36dc72 100644 --- a/src/compiler/scala/tools/nsc/ast/TreeInfo.scala +++ b/src/compiler/scala/tools/nsc/ast/TreeInfo.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.ast +package scala.tools.nsc +package ast import symtab.Flags._ import symtab.SymbolTable @@ -324,7 +325,7 @@ abstract class TreeInfo { /** Compilation unit is the predef object */ def isPredefUnit(tree: Tree): Boolean = tree match { - case PackageDef(nme.scala_, List(obj)) => isPredefObj(obj) + case PackageDef(Ident(nme.scala_), List(obj)) => isPredefObj(obj) case _ => false } diff --git a/src/compiler/scala/tools/nsc/ast/TreePrinters.scala b/src/compiler/scala/tools/nsc/ast/TreePrinters.scala index 43ecc7b9f1..fe2fa4513d 100644 --- a/src/compiler/scala/tools/nsc/ast/TreePrinters.scala +++ b/src/compiler/scala/tools/nsc/ast/TreePrinters.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.ast +package scala.tools.nsc +package ast import compat.Platform.{EOL => LINE_SEPARATOR} import java.io.{OutputStream, PrintWriter, Writer} diff --git a/src/compiler/scala/tools/nsc/ast/Trees.scala b/src/compiler/scala/tools/nsc/ast/Trees.scala index 79977d69bc..c005d0690e 100644 --- a/src/compiler/scala/tools/nsc/ast/Trees.scala +++ b/src/compiler/scala/tools/nsc/ast/Trees.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.ast +package scala.tools.nsc +package ast import java.io.{PrintWriter, StringWriter} @@ -273,6 +274,10 @@ trait Trees { override var symbol: Symbol = NoSymbol } + trait RefTree extends SymTree { + def name: Name + } + abstract class DefTree extends SymTree { def name: Name override def isDef = true @@ -338,14 +343,18 @@ trait Trees { final def hasFlag(mask: Long): Boolean = (mods.flags & mask) != 0 } - /** Package clause */ - case class PackageDef(name: Name, stats: List[Tree]) + /** Package clause + */ + case class PackageDef(pid: RefTree, stats: List[Tree]) extends MemberDef { + def name = pid.name def mods = NoMods } +/* disabled, as this is now dangerous def PackageDef(sym: Symbol, stats: List[Tree]): PackageDef = - PackageDef(sym.name, stats) setSymbol sym + PackageDef(Ident(sym.name), stats) setSymbol sym +*/ abstract class ImplDef extends MemberDef { def impl: Template @@ -812,10 +821,10 @@ trait Trees { def This(sym: Symbol): Tree = This(sym.name) setSymbol sym /** Designator <qualifier> . <selector> */ - case class Select(qualifier: Tree, selector: Name) - extends SymTree { - override def isTerm = selector.isTermName - override def isType = selector.isTypeName + case class Select(qualifier: Tree, name: Name) + extends RefTree { + override def isTerm = name.isTermName + override def isType = name.isTypeName } def Select(qualifier: Tree, sym: Symbol): Select = @@ -823,7 +832,7 @@ trait Trees { /** Identifier <name> */ case class Ident(name: Name) - extends SymTree { + extends RefTree { override def isTerm = name.isTermName override def isType = name.isTypeName } @@ -880,8 +889,8 @@ trait Trees { extends TypTree /** Type selection <qualifier> # <selector>, eliminated by RefCheck */ - case class SelectFromTypeTree(qualifier: Tree, selector: Name) - extends TypTree with SymTree + case class SelectFromTypeTree(qualifier: Tree, name: Name) + extends TypTree with RefTree /** Intersection type <parent1> with ... with <parentN> { <decls> }, eliminated by RefCheck */ case class CompoundTypeTree(templ: Template) @@ -909,8 +918,8 @@ trait Trees { /* A standard pattern match case EmptyTree => - case PackageDef(name, stats) => - // package name { stats } + case PackageDef(pid, stats) => + // package pid { stats } case ClassDef(mods, name, tparams, impl) => // mods class name [tparams] impl where impl = extends parents { defs } case ModuleDef(mods, name, impl) => (eliminated by refcheck) @@ -1023,7 +1032,7 @@ trait Trees { abstract class TreeCopier { def ClassDef(tree: Tree, mods: Modifiers, name: Name, tparams: List[TypeDef], impl: Template): ClassDef - def PackageDef(tree: Tree, name: Name, stats: List[Tree]): PackageDef + def PackageDef(tree: Tree, pid: RefTree, stats: List[Tree]): PackageDef def ModuleDef(tree: Tree, mods: Modifiers, name: Name, impl: Template): ModuleDef def ValDef(tree: Tree, mods: Modifiers, name: Name, tpt: Tree, rhs: Tree): ValDef def DefDef(tree: Tree, mods: Modifiers, name: Name, tparams: List[TypeDef], vparamss: List[List[ValDef]], tpt: Tree, rhs: Tree): DefDef @@ -1071,8 +1080,8 @@ trait Trees { class StrictTreeCopier extends TreeCopier { def ClassDef(tree: Tree, mods: Modifiers, name: Name, tparams: List[TypeDef], impl: Template) = new ClassDef(mods, name, tparams, impl).copyAttrs(tree); - def PackageDef(tree: Tree, name: Name, stats: List[Tree]) = - new PackageDef(name, stats).copyAttrs(tree) + def PackageDef(tree: Tree, pid: RefTree, stats: List[Tree]) = + new PackageDef(pid, stats).copyAttrs(tree) def ModuleDef(tree: Tree, mods: Modifiers, name: Name, impl: Template) = new ModuleDef(mods, name, impl).copyAttrs(tree) def ValDef(tree: Tree, mods: Modifiers, name: Name, tpt: Tree, rhs: Tree) = @@ -1166,10 +1175,10 @@ trait Trees { if (mods0 == mods) && (name0 == name) && (tparams0 == tparams) && (impl0 == impl) => t case _ => treeCopy.ClassDef(tree, mods, name, tparams, impl) } - def PackageDef(tree: Tree, name: Name, stats: List[Tree]) = tree match { - case t @ PackageDef(name0, stats0) - if (name0 == name) && (stats0 == stats) => t - case _ => treeCopy.PackageDef(tree, name, stats) + def PackageDef(tree: Tree, pid: RefTree, stats: List[Tree]) = tree match { + case t @ PackageDef(pid0, stats0) + if (pid0 == pid) && (stats0 == stats) => t + case _ => treeCopy.PackageDef(tree, pid, stats) } def ModuleDef(tree: Tree, mods: Modifiers, name: Name, impl: Template) = tree match { case t @ ModuleDef(mods0, name0, impl0) @@ -1392,10 +1401,13 @@ trait Trees { def transform(tree: Tree): Tree = tree match { case EmptyTree => tree - case PackageDef(name, stats) => - atOwner(tree.symbol.moduleClass) { - treeCopy.PackageDef(tree, name, transformStats(stats, currentOwner)) - } + case PackageDef(pid, stats) => + treeCopy.PackageDef( + tree, transform(pid).asInstanceOf[RefTree], + atOwner(tree.symbol.moduleClass) { + transformStats(stats, currentOwner) + } + ) case ClassDef(mods, name, tparams, impl) => atOwner(tree.symbol) { treeCopy.ClassDef(tree, transformModifiers(mods), name, @@ -1544,7 +1556,8 @@ trait Trees { def traverse(tree: Tree): Unit = tree match { case EmptyTree => ; - case PackageDef(name, stats) => + case PackageDef(pid, stats) => + traverse(pid) atOwner(tree.symbol.moduleClass) { traverseTrees(stats) } diff --git a/src/compiler/scala/tools/nsc/ast/parser/BracePair.scala b/src/compiler/scala/tools/nsc/ast/parser/BracePair.scala index 44cf5e7f2c..ea64eee7ba 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/BracePair.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/BracePair.scala @@ -2,7 +2,8 @@ * Copyright 2005-2009 LAMP/EPFL * @author Martin Odersky */ -package scala.tools.nsc.ast.parser +package scala.tools.nsc +package ast.parser /** A descriptor for a matching pair of braces. * @param loff The offset of the opening brace (-1 means missing) diff --git a/src/compiler/scala/tools/nsc/ast/parser/BracePatch.scala b/src/compiler/scala/tools/nsc/ast/parser/BracePatch.scala index 00d2e1a2ba..c77b33946a 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/BracePatch.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/BracePatch.scala @@ -2,7 +2,8 @@ * Copyright 2005-2009 LAMP/EPFL * @author Martin Odersky */ -package scala.tools.nsc.ast.parser +package scala.tools.nsc +package ast.parser /** A patch that postulates that a brace needs to be inserted or deleted at a given position. * @param off The offset where the brace needs to be inserted or deleted diff --git a/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala b/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala index d247134fd6..b1b9b81145 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala @@ -4,7 +4,8 @@ */ // $Id: MarkupParsers.scala 17754 2009-05-18 10:54:00Z milessabin $ -package scala.tools.nsc.ast.parser +package scala.tools.nsc +package ast.parser import scala.collection.mutable import scala.util.control.ControlException diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala index 2c878a7841..f18ac77ed4 100755 --- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala @@ -6,7 +6,8 @@ //todo: allow infix type patterns -package scala.tools.nsc.ast.parser +package scala.tools.nsc +package ast.parser import scala.collection.mutable.ListBuffer import scala.tools.nsc.util.{Position, OffsetPosition, NoPosition, BatchSourceFile} @@ -2340,14 +2341,16 @@ self => /** Create a tree representing a packaging */ def makePackaging(start: Int, pkg: Tree, stats: List[Tree]): PackageDef = - atPos(start, pkg.pos.point) { + atPos(start, pkg.pos.point) { PackageDef(pkg.asInstanceOf[RefTree], stats) } +/* pkg match { - case Ident(name) => - PackageDef(name, stats) - case Select(qual, name) => - makePackaging(start, qual, List(PackageDef(name, stats))) + case id @ Ident(_) => + PackageDef(id, stats) + case Select(qual, name) => // drop this to flatten packages + makePackaging(start, qual, List(PackageDef(Ident(name), stats))) } } +*/ /** Create a tree representing a package object, converting * package object foo { ... } @@ -2528,34 +2531,32 @@ self => stats.toList } - /** CompilationUnit ::= [package QualId semi] TopStatSeq + /** CompilationUnit ::= {package QualId semi} TopStatSeq */ def compilationUnit(): Tree = checkNoEscapingPlaceholders { - val ts = new ListBuffer[Tree] - - // @S: the IDE can insert phantom semi-colons before package during editing - // @S: just eat them (doesn't really change the grammar) - while (in.token == SEMI) in.nextToken() - val start = in.offset - if (in.token == PACKAGE) { - in.nextToken() - if (in.token == OBJECT) { - ts += makePackageObject(start, objectDef(NoMods)) - if (in.token != EOF) { - acceptStatSep() - ts ++= topStatSeq() - } - } else { - val pkg = qualId() - newLineOptWhenFollowedBy(LBRACE) - if (in.token == EOF) { - ts += makePackaging(start, pkg, List()) - } else if (isStatSep) { - in.nextToken() - ts += makePackaging(start, pkg, topStatSeq()) - } else { - accept(LBRACE) - ts += makePackaging(start, pkg, topStatSeq()) + def topstats(): List[Tree] = { + val ts = new ListBuffer[Tree] + while (in.token == SEMI) in.nextToken() + val start = in.offset + if (in.token == PACKAGE) { + in.nextToken() + if (in.token == OBJECT) { + ts += makePackageObject(start, objectDef(NoMods)) + if (in.token != EOF) { + acceptStatSep() + ts ++= topStatSeq() + } + } else { + val pkg = qualId() + newLineOptWhenFollowedBy(LBRACE) + if (in.token == EOF) { + ts += makePackaging(start, pkg, List()) + } else if (isStatSep) { + in.nextToken() + ts += makePackaging(start, pkg, topstats()) + } else { + accept(LBRACE) + ts += makePackaging(start, pkg, topStatSeq()) accept(RBRACE) ts ++= topStatSeq() } @@ -2563,13 +2564,15 @@ self => } else { ts ++= topStatSeq() } - val stats = ts.toList - atPos(start) { - stats match { - case List(stat @ PackageDef(_, _)) => stat - case _ => makePackaging(start, atPos(o2p(start)) { Ident(nme.EMPTY_PACKAGE_NAME) }, stats) - } + ts.toList + } + val start = in.offset + atPos(start) { + topstats() match { + case List(stat @ PackageDef(_, _)) => stat + case stats => makePackaging(start, atPos(o2p(start)) { Ident(nme.EMPTY_PACKAGE_NAME) }, stats) } + } } } } diff --git a/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala b/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala index aa7d104ab4..814017d6dc 100755 --- a/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala @@ -3,7 +3,8 @@ * @author Martin Odersky */ // $Id: Scanners.scala 17285 2009-03-11 13:51:56Z rytz $ -package scala.tools.nsc.ast.parser +package scala.tools.nsc +package ast.parser import scala.tools.nsc.util._ import SourceFile.{LF, FF, CR, SU} diff --git a/src/compiler/scala/tools/nsc/ast/parser/SymbolicXMLBuilder.scala b/src/compiler/scala/tools/nsc/ast/parser/SymbolicXMLBuilder.scala index 6e73427a69..26735aec65 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/SymbolicXMLBuilder.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/SymbolicXMLBuilder.scala @@ -4,7 +4,8 @@ */ // $Id: SymbolicXMLBuilder.scala 17756 2009-05-18 14:28:59Z rytz $ -package scala.tools.nsc.ast.parser +package scala.tools.nsc +package ast.parser import collection.mutable.Map import xml.{ EntityRef, Text } diff --git a/src/compiler/scala/tools/nsc/ast/parser/SyntaxAnalyzer.scala b/src/compiler/scala/tools/nsc/ast/parser/SyntaxAnalyzer.scala index 874dd3cf8d..d8f43cae2b 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/SyntaxAnalyzer.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/SyntaxAnalyzer.scala @@ -4,7 +4,8 @@ */ // $Id: SyntaxAnalyzer.scala 17080 2009-02-10 17:19:16Z rytz $ -package scala.tools.nsc.ast.parser +package scala.tools.nsc +package ast.parser import javac._ diff --git a/src/compiler/scala/tools/nsc/ast/parser/Tokens.scala b/src/compiler/scala/tools/nsc/ast/parser/Tokens.scala index 1b167e96a1..29da4008aa 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/Tokens.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/Tokens.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.ast.parser +package scala.tools.nsc +package ast.parser object Tokens { diff --git a/src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala b/src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala index e3d5eab42d..fe06b663b2 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.ast.parser +package scala.tools.nsc +package ast.parser import symtab.Flags._ import scala.collection.mutable.ListBuffer diff --git a/src/compiler/scala/tools/nsc/backend/ScalaPrimitives.scala b/src/compiler/scala/tools/nsc/backend/ScalaPrimitives.scala index 3f53b2e77c..5485294c00 100644 --- a/src/compiler/scala/tools/nsc/backend/ScalaPrimitives.scala +++ b/src/compiler/scala/tools/nsc/backend/ScalaPrimitives.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.nsc.backend +package scala.tools.nsc +package backend import scala.tools.nsc.backend.icode._ diff --git a/src/compiler/scala/tools/nsc/backend/WorklistAlgorithm.scala b/src/compiler/scala/tools/nsc/backend/WorklistAlgorithm.scala index d246699d3c..a3634556cd 100644 --- a/src/compiler/scala/tools/nsc/backend/WorklistAlgorithm.scala +++ b/src/compiler/scala/tools/nsc/backend/WorklistAlgorithm.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.nsc.backend +package scala.tools.nsc +package backend import scala.tools.nsc.ast._ import scala.collection.mutable.Stack diff --git a/src/compiler/scala/tools/nsc/backend/icode/BasicBlocks.scala b/src/compiler/scala/tools/nsc/backend/icode/BasicBlocks.scala index 382544bd0c..eb2d4bef10 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/BasicBlocks.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/BasicBlocks.scala @@ -5,7 +5,9 @@ // $Id$ -package scala.tools.nsc.backend.icode +package scala.tools.nsc +package backend +package icode //import scala.tools.nsc.ast._ import scala.collection.mutable.{Map, Set} diff --git a/src/compiler/scala/tools/nsc/backend/icode/CheckerError.scala b/src/compiler/scala/tools/nsc/backend/icode/CheckerError.scala index 083ae6f6f5..52f5f86326 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/CheckerError.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/CheckerError.scala @@ -5,7 +5,9 @@ // $Id$ -package scala.tools.nsc.backend.icode +package scala.tools.nsc +package backend +package icode class CheckerError(s: String) extends Exception(s) diff --git a/src/compiler/scala/tools/nsc/backend/icode/Checkers.scala b/src/compiler/scala/tools/nsc/backend/icode/Checkers.scala index 1bf3c691d5..51fca5f8ac 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/Checkers.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/Checkers.scala @@ -5,7 +5,9 @@ // $Id$ -package scala.tools.nsc.backend.icode +package scala.tools.nsc +package backend +package icode import scala.collection.mutable.{Buffer, ListBuffer, Map, HashMap} import scala.tools.nsc.symtab._ diff --git a/src/compiler/scala/tools/nsc/backend/icode/ExceptionHandlers.scala b/src/compiler/scala/tools/nsc/backend/icode/ExceptionHandlers.scala index 94db998bff..a0a673439f 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/ExceptionHandlers.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/ExceptionHandlers.scala @@ -5,7 +5,9 @@ // $Id$ -package scala.tools.nsc.backend.icode; +package scala.tools.nsc +package backend +package icode; import scala.collection._ diff --git a/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala b/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala index 134c0e3999..bee6674fd1 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala @@ -5,7 +5,9 @@ // $Id$ -package scala.tools.nsc.backend.icode +package scala.tools.nsc +package backend +package icode import scala.collection.mutable.{Map, HashMap, ListBuffer, Buffer, HashSet} import scala.tools.nsc.symtab._ @@ -77,8 +79,8 @@ abstract class GenICode extends SubComponent { def gen(tree: Tree, ctx: Context): Context = tree match { case EmptyTree => ctx - case PackageDef(name, stats) => - gen(stats, ctx setPackage name) + case PackageDef(pid, stats) => + gen(stats, ctx setPackage pid.name) case ClassDef(mods, name, _, impl) => log("Generating class: " + tree.symbol.fullNameString) diff --git a/src/compiler/scala/tools/nsc/backend/icode/ICodes.scala b/src/compiler/scala/tools/nsc/backend/icode/ICodes.scala index 55a96703b1..000f2085c6 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/ICodes.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/ICodes.scala @@ -5,7 +5,9 @@ // $Id$ -package scala.tools.nsc.backend.icode +package scala.tools.nsc +package backend +package icode import java.io.PrintWriter diff --git a/src/compiler/scala/tools/nsc/backend/icode/Linearizers.scala b/src/compiler/scala/tools/nsc/backend/icode/Linearizers.scala index d69bf7dc1e..7d9b2fd537 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/Linearizers.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/Linearizers.scala @@ -5,7 +5,9 @@ // $Id$ -package scala.tools.nsc.backend.icode; +package scala.tools.nsc +package backend +package icode; import scala.tools.nsc.ast._; import scala.collection.mutable.{Stack, HashSet, BitSet}; diff --git a/src/compiler/scala/tools/nsc/backend/icode/Members.scala b/src/compiler/scala/tools/nsc/backend/icode/Members.scala index aba565d556..19f78626e9 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/Members.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/Members.scala @@ -5,7 +5,9 @@ // $Id$ -package scala.tools.nsc.backend.icode +package scala.tools.nsc +package backend +package icode import java.io.PrintWriter diff --git a/src/compiler/scala/tools/nsc/backend/icode/Opcodes.scala b/src/compiler/scala/tools/nsc/backend/icode/Opcodes.scala index 22b932b666..7351e4d05f 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/Opcodes.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/Opcodes.scala @@ -6,7 +6,9 @@ // $Id$ -package scala.tools.nsc.backend.icode +package scala.tools.nsc +package backend +package icode import scala.tools.nsc.ast._ import scala.tools.nsc.util.{Position,NoPosition} diff --git a/src/compiler/scala/tools/nsc/backend/icode/Primitives.scala b/src/compiler/scala/tools/nsc/backend/icode/Primitives.scala index edc51056c0..b9564a3cb1 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/Primitives.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/Primitives.scala @@ -5,7 +5,9 @@ // $Id$ -package scala.tools.nsc.backend.icode; +package scala.tools.nsc +package backend +package icode; import java.io.PrintWriter; diff --git a/src/compiler/scala/tools/nsc/backend/icode/Printers.scala b/src/compiler/scala/tools/nsc/backend/icode/Printers.scala index f3a1096271..812d77f4ff 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/Printers.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/Printers.scala @@ -5,7 +5,9 @@ // $Id$ -package scala.tools.nsc.backend.icode +package scala.tools.nsc +package backend +package icode import java.io.PrintWriter diff --git a/src/compiler/scala/tools/nsc/backend/icode/Repository.scala b/src/compiler/scala/tools/nsc/backend/icode/Repository.scala index 379ef80da4..2fc200227c 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/Repository.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/Repository.scala @@ -5,7 +5,9 @@ // $Id$ -package scala.tools.nsc.backend.icode +package scala.tools.nsc +package backend +package icode import scala.collection._ diff --git a/src/compiler/scala/tools/nsc/backend/icode/TypeKinds.scala b/src/compiler/scala/tools/nsc/backend/icode/TypeKinds.scala index a9fc518272..6e83d629b4 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/TypeKinds.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/TypeKinds.scala @@ -5,7 +5,9 @@ // $Id$ -package scala.tools.nsc.backend.icode +package scala.tools.nsc +package backend +package icode /* A type case diff --git a/src/compiler/scala/tools/nsc/backend/icode/TypeStacks.scala b/src/compiler/scala/tools/nsc/backend/icode/TypeStacks.scala index 5ac7943c23..205b43eea6 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/TypeStacks.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/TypeStacks.scala @@ -5,7 +5,9 @@ // $Id$ -package scala.tools.nsc.backend.icode +package scala.tools.nsc +package backend +package icode /** This trait ... * diff --git a/src/compiler/scala/tools/nsc/backend/icode/analysis/CompleteLattice.scala b/src/compiler/scala/tools/nsc/backend/icode/analysis/CompleteLattice.scala index 8d5b81c5b4..d7496f5db4 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/analysis/CompleteLattice.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/analysis/CompleteLattice.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.nsc.backend.icode.analysis +package scala.tools.nsc +package backend.icode.analysis /** A complete lattice. */ diff --git a/src/compiler/scala/tools/nsc/backend/icode/analysis/CopyPropagation.scala b/src/compiler/scala/tools/nsc/backend/icode/analysis/CopyPropagation.scala index 086ff74b0e..d83e7341e6 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/analysis/CopyPropagation.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/analysis/CopyPropagation.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.nsc.backend.icode.analysis +package scala.tools.nsc +package backend.icode.analysis import scala.collection.mutable.{Map, HashMap} import scala.tools.nsc.symtab.Flags.DEFERRED diff --git a/src/compiler/scala/tools/nsc/backend/icode/analysis/DataFlowAnalysis.scala b/src/compiler/scala/tools/nsc/backend/icode/analysis/DataFlowAnalysis.scala index 23a28b4a2d..ff8a1dcdee 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/analysis/DataFlowAnalysis.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/analysis/DataFlowAnalysis.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.nsc.backend.icode.analysis +package scala.tools.nsc +package backend.icode.analysis import scala.collection.mutable.{Map, HashMap, Set, HashSet, LinkedHashSet} diff --git a/src/compiler/scala/tools/nsc/backend/icode/analysis/Liveness.scala b/src/compiler/scala/tools/nsc/backend/icode/analysis/Liveness.scala index 4f659cf980..243585a4b7 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/analysis/Liveness.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/analysis/Liveness.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.nsc.backend.icode.analysis +package scala.tools.nsc +package backend.icode.analysis import scala.collection.mutable.{HashMap, Map} import scala.collection.immutable.{Set, ListSet} diff --git a/src/compiler/scala/tools/nsc/backend/icode/analysis/LubError.scala b/src/compiler/scala/tools/nsc/backend/icode/analysis/LubError.scala index 6bffa362fa..4a1c75f199 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/analysis/LubError.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/analysis/LubError.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.nsc.backend.icode.analysis +package scala.tools.nsc +package backend.icode.analysis class LubError(a: Any, b: Any, msg: String) extends Exception { override def toString() = "Lub error: " + msg + a + b diff --git a/src/compiler/scala/tools/nsc/backend/icode/analysis/ProgramPoint.scala b/src/compiler/scala/tools/nsc/backend/icode/analysis/ProgramPoint.scala index d591d2cda2..eee4fe1741 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/analysis/ProgramPoint.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/analysis/ProgramPoint.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.nsc.backend.icode.analysis +package scala.tools.nsc +package backend.icode.analysis /** Program points are locations in the program where we want to * assert certain properties through data flow analysis, e.g. diff --git a/src/compiler/scala/tools/nsc/backend/icode/analysis/ReachingDefinitions.scala b/src/compiler/scala/tools/nsc/backend/icode/analysis/ReachingDefinitions.scala index 96f5500fb1..ecb89cbe91 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/analysis/ReachingDefinitions.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/analysis/ReachingDefinitions.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.nsc.backend.icode.analysis +package scala.tools.nsc +package backend.icode.analysis import scala.collection.immutable.{Set, ListSet, HashSet} import scala.collection.mutable.{HashMap, Map} diff --git a/src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala b/src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala index f156f0e8c2..b6fbef5e97 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.nsc.backend.icode.analysis +package scala.tools.nsc +package backend.icode.analysis import scala.collection.{mutable, immutable} diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala index 9d33585ff2..2184b554f8 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.nsc.backend.jvm +package scala.tools.nsc +package backend.jvm import java.io.{DataOutputStream, File, OutputStream} import java.nio.ByteBuffer diff --git a/src/compiler/scala/tools/nsc/backend/msil/GenMSIL.scala b/src/compiler/scala/tools/nsc/backend/msil/GenMSIL.scala index 6b101fb10d..58e1e598bc 100644 --- a/src/compiler/scala/tools/nsc/backend/msil/GenMSIL.scala +++ b/src/compiler/scala/tools/nsc/backend/msil/GenMSIL.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.nsc.backend.msil +package scala.tools.nsc +package backend.msil import java.io.{File, IOException} import java.nio.{ByteBuffer, ByteOrder} diff --git a/src/compiler/scala/tools/nsc/backend/opt/ClosureElimination.scala b/src/compiler/scala/tools/nsc/backend/opt/ClosureElimination.scala index f597a050da..cd9267e0c4 100644 --- a/src/compiler/scala/tools/nsc/backend/opt/ClosureElimination.scala +++ b/src/compiler/scala/tools/nsc/backend/opt/ClosureElimination.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.nsc.backend.opt; +package scala.tools.nsc +package backend.opt; import scala.collection.mutable.{Map, HashMap}; import scala.tools.nsc.backend.icode.analysis.LubError; diff --git a/src/compiler/scala/tools/nsc/backend/opt/DeadCodeElimination.scala b/src/compiler/scala/tools/nsc/backend/opt/DeadCodeElimination.scala index 0c6f7cad23..2ca1e322e5 100644 --- a/src/compiler/scala/tools/nsc/backend/opt/DeadCodeElimination.scala +++ b/src/compiler/scala/tools/nsc/backend/opt/DeadCodeElimination.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.nsc.backend.opt +package scala.tools.nsc +package backend.opt import scala.collection._ import scala.collection.immutable.{Map, HashMap, Set, HashSet} diff --git a/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala b/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala index 114054aaeb..f957aa4fe5 100644 --- a/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala +++ b/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.nsc.backend.opt +package scala.tools.nsc +package backend.opt import scala.util.control.Breaks._ diff --git a/src/compiler/scala/tools/nsc/dependencies/Changes.scala b/src/compiler/scala/tools/nsc/dependencies/Changes.scala index 09145923b7..69d2c7fd6a 100644 --- a/src/compiler/scala/tools/nsc/dependencies/Changes.scala +++ b/src/compiler/scala/tools/nsc/dependencies/Changes.scala @@ -1,4 +1,5 @@ -package scala.tools.nsc.dependencies +package scala.tools.nsc +package dependencies import symtab.Flags diff --git a/src/compiler/scala/tools/nsc/dependencies/DependencyAnalysis.scala b/src/compiler/scala/tools/nsc/dependencies/DependencyAnalysis.scala index 48b22677b2..fa7a5f94ae 100644 --- a/src/compiler/scala/tools/nsc/dependencies/DependencyAnalysis.scala +++ b/src/compiler/scala/tools/nsc/dependencies/DependencyAnalysis.scala @@ -1,6 +1,7 @@ -package scala.tools.nsc.dependencies; +package scala.tools.nsc +package dependencies; import util.SourceFile; -import nsc.io.AbstractFile +import io.AbstractFile trait DependencyAnalysis extends SubComponent with Files { import global._ diff --git a/src/compiler/scala/tools/nsc/dependencies/Files.scala b/src/compiler/scala/tools/nsc/dependencies/Files.scala index 7d52206392..b4852ee0ce 100644 --- a/src/compiler/scala/tools/nsc/dependencies/Files.scala +++ b/src/compiler/scala/tools/nsc/dependencies/Files.scala @@ -1,7 +1,8 @@ -package scala.tools.nsc.dependencies; +package scala.tools.nsc +package dependencies; import java.io.{InputStream, OutputStream, PrintStream, InputStreamReader, BufferedReader} -import nsc.io.{AbstractFile, PlainFile} +import io.{AbstractFile, PlainFile} import scala.collection._; diff --git a/src/compiler/scala/tools/nsc/dependencies/References.scala b/src/compiler/scala/tools/nsc/dependencies/References.scala index 9f50199d5f..23bfba9e31 100644 --- a/src/compiler/scala/tools/nsc/dependencies/References.scala +++ b/src/compiler/scala/tools/nsc/dependencies/References.scala @@ -1,4 +1,5 @@ -package scala.tools.nsc.dependencies; +package scala.tools.nsc +package dependencies; import util.SourceFile; import io.AbstractFile import symtab.Flags diff --git a/src/compiler/scala/tools/nsc/doc/DefaultDocDriver.scala b/src/compiler/scala/tools/nsc/doc/DefaultDocDriver.scala index a7d38d8245..5a8f67a095 100644 --- a/src/compiler/scala/tools/nsc/doc/DefaultDocDriver.scala +++ b/src/compiler/scala/tools/nsc/doc/DefaultDocDriver.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.doc +package scala.tools.nsc +package doc import scala.collection.mutable import java.util.zip.ZipFile diff --git a/src/compiler/scala/tools/nsc/doc/DocDriver.scala b/src/compiler/scala/tools/nsc/doc/DocDriver.scala index bd0de8a627..3593775e35 100644 --- a/src/compiler/scala/tools/nsc/doc/DocDriver.scala +++ b/src/compiler/scala/tools/nsc/doc/DocDriver.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.doc +package scala.tools.nsc +package doc /** * This is an abstract class for documentation plugins. diff --git a/src/compiler/scala/tools/nsc/doc/DocUtil.scala b/src/compiler/scala/tools/nsc/doc/DocUtil.scala index 7c976472d3..b3b8558865 100644 --- a/src/compiler/scala/tools/nsc/doc/DocUtil.scala +++ b/src/compiler/scala/tools/nsc/doc/DocUtil.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.doc +package scala.tools.nsc +package doc import java.io.StringReader import org.xml.sax.InputSource diff --git a/src/compiler/scala/tools/nsc/doc/ModelAdditions.scala b/src/compiler/scala/tools/nsc/doc/ModelAdditions.scala index 2a95b80b5e..e3186fd3fe 100644 --- a/src/compiler/scala/tools/nsc/doc/ModelAdditions.scala +++ b/src/compiler/scala/tools/nsc/doc/ModelAdditions.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.doc +package scala.tools.nsc +package doc /** * @author Stephane Micheloud, Sean McDirmid, Geoffrey Washburn diff --git a/src/compiler/scala/tools/nsc/doc/ModelExtractor.scala b/src/compiler/scala/tools/nsc/doc/ModelExtractor.scala index 3e827aa0b1..7ab7d57d12 100644 --- a/src/compiler/scala/tools/nsc/doc/ModelExtractor.scala +++ b/src/compiler/scala/tools/nsc/doc/ModelExtractor.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.doc +package scala.tools.nsc +package doc import scala.collection.mutable import compat.Platform.{EOL => LINE_SEPARATOR} diff --git a/src/compiler/scala/tools/nsc/doc/ModelFrames.scala b/src/compiler/scala/tools/nsc/doc/ModelFrames.scala index 1f0453db6e..970a179cc8 100644 --- a/src/compiler/scala/tools/nsc/doc/ModelFrames.scala +++ b/src/compiler/scala/tools/nsc/doc/ModelFrames.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.doc +package scala.tools.nsc +package doc import java.io.{File, FileWriter} import scala.util.NameTransformer diff --git a/src/compiler/scala/tools/nsc/doc/ModelToXML.scala b/src/compiler/scala/tools/nsc/doc/ModelToXML.scala index 21729b32b8..d5a2704857 100644 --- a/src/compiler/scala/tools/nsc/doc/ModelToXML.scala +++ b/src/compiler/scala/tools/nsc/doc/ModelToXML.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.doc +package scala.tools.nsc +package doc import scala.xml._ diff --git a/src/compiler/scala/tools/nsc/doc/Settings.scala b/src/compiler/scala/tools/nsc/doc/Settings.scala index 7d25cbc310..9861c159fc 100644 --- a/src/compiler/scala/tools/nsc/doc/Settings.scala +++ b/src/compiler/scala/tools/nsc/doc/Settings.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.doc +package scala.tools.nsc +package doc import java.io.File import java.lang.System diff --git a/src/compiler/scala/tools/nsc/interactive/BuildManager.scala b/src/compiler/scala/tools/nsc/interactive/BuildManager.scala index 5747982e18..504e82dce3 100644 --- a/src/compiler/scala/tools/nsc/interactive/BuildManager.scala +++ b/src/compiler/scala/tools/nsc/interactive/BuildManager.scala @@ -1,4 +1,5 @@ -package scala.tools.nsc.interactive +package scala.tools.nsc +package interactive import scala.collection._ @@ -6,7 +7,7 @@ import scala.tools.nsc.reporters.{Reporter, ConsoleReporter} import util.FakePos import dependencies._ -import nsc.io.AbstractFile +import io.AbstractFile trait BuildManager { @@ -27,7 +28,7 @@ trait BuildManager { /** Save dependency information to `file'. */ def saveTo(file: AbstractFile) - def compiler: nsc.Global + def compiler: scala.tools.nsc.Global } diff --git a/src/compiler/scala/tools/nsc/interactive/CompilerControl.scala b/src/compiler/scala/tools/nsc/interactive/CompilerControl.scala index 0782639ac5..4fda69a66e 100644 --- a/src/compiler/scala/tools/nsc/interactive/CompilerControl.scala +++ b/src/compiler/scala/tools/nsc/interactive/CompilerControl.scala @@ -1,4 +1,5 @@ -package scala.tools.nsc.interactive +package scala.tools.nsc +package interactive import scala.concurrent.SyncVar import scala.util.control.ControlException diff --git a/src/compiler/scala/tools/nsc/interactive/ContextTrees.scala b/src/compiler/scala/tools/nsc/interactive/ContextTrees.scala index 8d188cac62..f90434b4bc 100755 --- a/src/compiler/scala/tools/nsc/interactive/ContextTrees.scala +++ b/src/compiler/scala/tools/nsc/interactive/ContextTrees.scala @@ -1,7 +1,8 @@ -package scala.tools.nsc.interactive +package scala.tools.nsc +package interactive import collection.mutable.ArrayBuffer -import nsc.util.Position +import util.Position trait ContextTrees { self: Global => diff --git a/src/compiler/scala/tools/nsc/interactive/Global.scala b/src/compiler/scala/tools/nsc/interactive/Global.scala index 93057c29ec..c8f7de2666 100755 --- a/src/compiler/scala/tools/nsc/interactive/Global.scala +++ b/src/compiler/scala/tools/nsc/interactive/Global.scala @@ -1,4 +1,5 @@ -package scala.tools.nsc.interactive +package scala.tools.nsc +package interactive import java.io.{ PrintWriter, StringWriter } @@ -14,13 +15,15 @@ import scala.tools.nsc.ast._ /** The main class of the presentation compiler in an interactive environment such as an IDE */ class Global(settings: Settings, reporter: Reporter) - extends nsc.Global(settings, reporter) + extends scala.tools.nsc.Global(settings, reporter) with CompilerControl with RangePositions with ContextTrees with RichCompilationUnits { self => + settings.XprintPos.value = true + import definitions._ override def onlyPresentation = true @@ -414,7 +417,7 @@ self => assert(unit.status >= JustParsed) unit.targetPos = pos try { - println("starting type targetted check") + println("starting targeted type check") typeCheck(unit) throw new FatalError("tree not found") } catch { diff --git a/src/compiler/scala/tools/nsc/interactive/Positions.scala b/src/compiler/scala/tools/nsc/interactive/Positions.scala index 277d35ec39..b8be2b1fbb 100755 --- a/src/compiler/scala/tools/nsc/interactive/Positions.scala +++ b/src/compiler/scala/tools/nsc/interactive/Positions.scala @@ -1,11 +1,12 @@ -package scala.tools.nsc.interactive +package scala.tools.nsc +package interactive import ast.Trees import scala.tools.nsc.util.{SourceFile, Position, RangePosition, OffsetPosition, NoPosition, SyntheticOffsetPosition, WorkScheduler} import scala.collection.mutable.ListBuffer trait Positions { -self: nsc.Global => +self: scala.tools.nsc.Global => def rangePos(source: SourceFile, start: Int, point: Int, end: Int) = new OffsetPosition(source, point) diff --git a/src/compiler/scala/tools/nsc/interactive/REPL.scala b/src/compiler/scala/tools/nsc/interactive/REPL.scala index 2d158e1ee3..993dd617b8 100644 --- a/src/compiler/scala/tools/nsc/interactive/REPL.scala +++ b/src/compiler/scala/tools/nsc/interactive/REPL.scala @@ -1,4 +1,5 @@ -package scala.tools.nsc.interactive +package scala.tools.nsc +package interactive import scala.concurrent.SyncVar import scala.tools.nsc.util._ diff --git a/src/compiler/scala/tools/nsc/interactive/RangePositions.scala b/src/compiler/scala/tools/nsc/interactive/RangePositions.scala index 00db6de9dd..d195e1c157 100755 --- a/src/compiler/scala/tools/nsc/interactive/RangePositions.scala +++ b/src/compiler/scala/tools/nsc/interactive/RangePositions.scala @@ -1,4 +1,5 @@ -package scala.tools.nsc.interactive +package scala.tools.nsc +package interactive import ast.Trees import scala.tools.nsc.util.{SourceFile, Position, RangePosition, OffsetPosition, NoPosition, SyntheticOffsetPosition, WorkScheduler} @@ -22,7 +23,7 @@ import scala.collection.mutable.ListBuffer * Otherwise, the singleton consisting of the node itself. */ trait RangePositions extends Trees with Positions { -self: nsc.Global => +self: scala.tools.nsc.Global => case class Range(pos: Position, tree: Tree) { def isFree = tree == EmptyTree diff --git a/src/compiler/scala/tools/nsc/interactive/RefinedBuildManager.scala b/src/compiler/scala/tools/nsc/interactive/RefinedBuildManager.scala index 7ee7377d3d..2c2c7b2b2e 100644 --- a/src/compiler/scala/tools/nsc/interactive/RefinedBuildManager.scala +++ b/src/compiler/scala/tools/nsc/interactive/RefinedBuildManager.scala @@ -1,4 +1,5 @@ -package scala.tools.nsc.interactive +package scala.tools.nsc +package interactive import scala.collection._ import scala.tools.nsc.reporters.{Reporter, ConsoleReporter} @@ -6,7 +7,7 @@ import scala.util.control.Breaks._ import dependencies._ import util.FakePos -import nsc.io.AbstractFile +import io.AbstractFile /** A more defined build manager, based on change sets. For each * updated source file, it computes the set of changes to its @@ -16,7 +17,7 @@ import nsc.io.AbstractFile */ class RefinedBuildManager(val settings: Settings) extends Changes with BuildManager { - class BuilderGlobal(settings: Settings) extends nsc.Global(settings) { + class BuilderGlobal(settings: Settings) extends scala.tools.nsc.Global(settings) { object referencesAnalysis extends { val global: BuilderGlobal.this.type = BuilderGlobal.this diff --git a/src/compiler/scala/tools/nsc/interactive/RichCompilationUnits.scala b/src/compiler/scala/tools/nsc/interactive/RichCompilationUnits.scala index b8b59b67ae..8e6ba614e6 100644 --- a/src/compiler/scala/tools/nsc/interactive/RichCompilationUnits.scala +++ b/src/compiler/scala/tools/nsc/interactive/RichCompilationUnits.scala @@ -1,4 +1,5 @@ -package scala.tools.nsc.interactive +package scala.tools.nsc +package interactive import scala.tools.nsc.util.{SourceFile, Position, NoPosition} diff --git a/src/compiler/scala/tools/nsc/interactive/SimpleBuildManager.scala b/src/compiler/scala/tools/nsc/interactive/SimpleBuildManager.scala index bd8e28e759..9ec69b3af5 100644 --- a/src/compiler/scala/tools/nsc/interactive/SimpleBuildManager.scala +++ b/src/compiler/scala/tools/nsc/interactive/SimpleBuildManager.scala @@ -1,4 +1,5 @@ -package scala.tools.nsc.interactive +package scala.tools.nsc +package interactive import scala.collection._ @@ -6,7 +7,7 @@ import scala.tools.nsc.reporters.{Reporter, ConsoleReporter} import dependencies._ import util.FakePos -import nsc.io.AbstractFile +import io.AbstractFile /** A simple build manager, using the default scalac dependency tracker. * The transitive closure of all dependent files on a modified file @@ -17,7 +18,7 @@ import nsc.io.AbstractFile */ class SimpleBuildManager(val settings: Settings) extends BuildManager { - val compiler: nsc.Global = new nsc.Global(settings) + val compiler: scala.tools.nsc.Global = new scala.tools.nsc.Global(settings) /** Managed source files. */ private val sources: mutable.Set[AbstractFile] = new mutable.HashSet[AbstractFile] diff --git a/src/compiler/scala/tools/nsc/interpreter/AbstractFileClassLoader.scala b/src/compiler/scala/tools/nsc/interpreter/AbstractFileClassLoader.scala index 964fd3f377..c2c49d18dd 100644 --- a/src/compiler/scala/tools/nsc/interpreter/AbstractFileClassLoader.scala +++ b/src/compiler/scala/tools/nsc/interpreter/AbstractFileClassLoader.scala @@ -3,7 +3,8 @@ */ // $Id: $ -package scala.tools.nsc.interpreter +package scala.tools.nsc +package interpreter import scala.tools.nsc.io.AbstractFile import scala.util.ScalaClassLoader diff --git a/src/compiler/scala/tools/nsc/interpreter/Completion.scala b/src/compiler/scala/tools/nsc/interpreter/Completion.scala index 4b03299de1..fed2a6c5c1 100644 --- a/src/compiler/scala/tools/nsc/interpreter/Completion.scala +++ b/src/compiler/scala/tools/nsc/interpreter/Completion.scala @@ -19,7 +19,8 @@ // 6) Security: Are we using the filesystem unnecessarily? // -package scala.tools.nsc.interpreter +package scala.tools.nsc +package interpreter import jline._ import java.net.URL @@ -221,4 +222,4 @@ object Completion jars foreach oneJar } -}
\ No newline at end of file +} diff --git a/src/compiler/scala/tools/nsc/interpreter/InteractiveReader.scala b/src/compiler/scala/tools/nsc/interpreter/InteractiveReader.scala index 3d1bfd547a..7e56986900 100644 --- a/src/compiler/scala/tools/nsc/interpreter/InteractiveReader.scala +++ b/src/compiler/scala/tools/nsc/interpreter/InteractiveReader.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.interpreter +package scala.tools.nsc +package interpreter import scala.util.control.Exception._ /** Reads lines from an input stream */ diff --git a/src/compiler/scala/tools/nsc/interpreter/JLineReader.scala b/src/compiler/scala/tools/nsc/interpreter/JLineReader.scala index 0f9a87518a..d1613b9cd8 100644 --- a/src/compiler/scala/tools/nsc/interpreter/JLineReader.scala +++ b/src/compiler/scala/tools/nsc/interpreter/JLineReader.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.interpreter +package scala.tools.nsc +package interpreter import java.io.File import jline.{ History, ConsoleReader, ArgumentCompletor } diff --git a/src/compiler/scala/tools/nsc/interpreter/SimpleReader.scala b/src/compiler/scala/tools/nsc/interpreter/SimpleReader.scala index 1bd5f217c1..403c0b996c 100644 --- a/src/compiler/scala/tools/nsc/interpreter/SimpleReader.scala +++ b/src/compiler/scala/tools/nsc/interpreter/SimpleReader.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.interpreter +package scala.tools.nsc +package interpreter import java.io.{BufferedReader, PrintWriter} diff --git a/src/compiler/scala/tools/nsc/io/AbstractFile.scala b/src/compiler/scala/tools/nsc/io/AbstractFile.scala index 70121aefb9..eaa3091eee 100644 --- a/src/compiler/scala/tools/nsc/io/AbstractFile.scala +++ b/src/compiler/scala/tools/nsc/io/AbstractFile.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.nsc.io +package scala.tools.nsc +package io import java.io.{File, FileOutputStream, IOException, InputStream, OutputStream} import java.net.URL diff --git a/src/compiler/scala/tools/nsc/io/PlainFile.scala b/src/compiler/scala/tools/nsc/io/PlainFile.scala index aa839d5892..a52ec203dc 100644 --- a/src/compiler/scala/tools/nsc/io/PlainFile.scala +++ b/src/compiler/scala/tools/nsc/io/PlainFile.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.nsc.io +package scala.tools.nsc +package io import java.io.{File, FileInputStream, FileOutputStream, IOException} diff --git a/src/compiler/scala/tools/nsc/io/SourceReader.scala b/src/compiler/scala/tools/nsc/io/SourceReader.scala index 15ccee983f..21b4305b6b 100644 --- a/src/compiler/scala/tools/nsc/io/SourceReader.scala +++ b/src/compiler/scala/tools/nsc/io/SourceReader.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.nsc.io +package scala.tools.nsc +package io import java.io.{File, FileInputStream, InputStream, IOException} import java.nio.{ByteBuffer, CharBuffer} @@ -28,7 +29,7 @@ class SourceReader(decoder: CharsetDecoder, reporter: Reporter) { private var chars: CharBuffer = CharBuffer.allocate(0x4000) private def reportEncodingError(filename:String) = { - reporter.error(nsc.util.NoPosition, + reporter.error(util.NoPosition, "IO error while decoding "+filename+" with "+decoder.charset()+"\n"+ "Please try specifying another one using the -encoding option") } diff --git a/src/compiler/scala/tools/nsc/io/VirtualDirectory.scala b/src/compiler/scala/tools/nsc/io/VirtualDirectory.scala index 53346df53c..ff4768c6f8 100644 --- a/src/compiler/scala/tools/nsc/io/VirtualDirectory.scala +++ b/src/compiler/scala/tools/nsc/io/VirtualDirectory.scala @@ -2,7 +2,8 @@ * Copyright 2005-2009 LAMP/EPFL */ // $Id$ -package scala.tools.nsc.io +package scala.tools.nsc +package io import scala.collection.{mutable=>mut} /** diff --git a/src/compiler/scala/tools/nsc/io/VirtualFile.scala b/src/compiler/scala/tools/nsc/io/VirtualFile.scala index ba86a165f7..14d081991e 100644 --- a/src/compiler/scala/tools/nsc/io/VirtualFile.scala +++ b/src/compiler/scala/tools/nsc/io/VirtualFile.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.nsc.io +package scala.tools.nsc +package io import java.io.{ByteArrayInputStream, ByteArrayOutputStream, File, InputStream, OutputStream} diff --git a/src/compiler/scala/tools/nsc/io/ZipArchive.scala b/src/compiler/scala/tools/nsc/io/ZipArchive.scala index c380acd9a3..9d322af889 100644 --- a/src/compiler/scala/tools/nsc/io/ZipArchive.scala +++ b/src/compiler/scala/tools/nsc/io/ZipArchive.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.nsc.io +package scala.tools.nsc +package io import java.io.{File, IOException, InputStream} import java.net.URL diff --git a/src/compiler/scala/tools/nsc/javac/JavaParsers.scala b/src/compiler/scala/tools/nsc/javac/JavaParsers.scala index 5cfee91651..1e6e5b297c 100755 --- a/src/compiler/scala/tools/nsc/javac/JavaParsers.scala +++ b/src/compiler/scala/tools/nsc/javac/JavaParsers.scala @@ -6,7 +6,8 @@ //todo: allow infix type patterns -package scala.tools.nsc.javac +package scala.tools.nsc +package javac import scala.tools.nsc.util.{Position, OffsetPosition, NoPosition, BatchSourceFile} import scala.collection.mutable.ListBuffer @@ -113,12 +114,8 @@ trait JavaParsers extends JavaScanners { def blankExpr = Ident(nme.WILDCARD) - def makePackaging(pkg: Tree, stats: List[Tree]): PackageDef = pkg match { - case Ident(name) => - PackageDef(name, stats).setPos(pkg.pos) - case Select(qual, name) => - makePackaging(qual, List(PackageDef(name, stats).setPos(pkg.pos))) - } + def makePackaging(pkg: RefTree, stats: List[Tree]): PackageDef = + atPos(pkg.pos) { PackageDef(pkg, stats) } def makeTemplate(parents: List[Tree], stats: List[Tree]) = Template( @@ -239,8 +236,8 @@ trait JavaParsers extends JavaScanners { // -------------------- specific parsing routines ------------------ - def qualId(): Tree = { - var t: Tree = atPos(in.currentPos) { Ident(ident()) } + def qualId(): RefTree = { + var t: RefTree = atPos(in.currentPos) { Ident(ident()) } while (in.token == DOT) { in.nextToken t = atPos(in.currentPos) { Select(t, ident()) } @@ -861,7 +858,7 @@ trait JavaParsers extends JavaScanners { */ def compilationUnit(): Tree = { var pos = in.currentPos; - val pkg = + val pkg: RefTree = if (in.token == AT || in.token == PACKAGE) { annotations() pos = in.currentPos diff --git a/src/compiler/scala/tools/nsc/javac/JavaScanners.scala b/src/compiler/scala/tools/nsc/javac/JavaScanners.scala index 1ee41bb676..ab6de92b7a 100755 --- a/src/compiler/scala/tools/nsc/javac/JavaScanners.scala +++ b/src/compiler/scala/tools/nsc/javac/JavaScanners.scala @@ -3,7 +3,8 @@ * @author Martin Odersky */ -package scala.tools.nsc.javac +package scala.tools.nsc +package javac import scala.tools.nsc.util._ import SourceFile.{LF, FF, CR, SU} diff --git a/src/compiler/scala/tools/nsc/javac/JavaTokens.scala b/src/compiler/scala/tools/nsc/javac/JavaTokens.scala index d9fc804b97..8021a31a7b 100755 --- a/src/compiler/scala/tools/nsc/javac/JavaTokens.scala +++ b/src/compiler/scala/tools/nsc/javac/JavaTokens.scala @@ -4,7 +4,8 @@ */ // $Id: Tokens.scala 12886 2007-09-17 16:36:10Z mcdirmid $ -package scala.tools.nsc.javac +package scala.tools.nsc +package javac object JavaTokens { diff --git a/src/compiler/scala/tools/nsc/matching/MatchUtil.scala b/src/compiler/scala/tools/nsc/matching/MatchUtil.scala index e6cf468328..2c7668564e 100644 --- a/src/compiler/scala/tools/nsc/matching/MatchUtil.scala +++ b/src/compiler/scala/tools/nsc/matching/MatchUtil.scala @@ -1,7 +1,8 @@ /* NSC -- new Scala compiler */ -package scala.tools.nsc.matching +package scala.tools.nsc +package matching /** * Utility classes, most of which probably belong somewhere else. diff --git a/src/compiler/scala/tools/nsc/matching/ParallelMatching.scala b/src/compiler/scala/tools/nsc/matching/ParallelMatching.scala index cd140e7c49..b5c242ccd2 100644 --- a/src/compiler/scala/tools/nsc/matching/ParallelMatching.scala +++ b/src/compiler/scala/tools/nsc/matching/ParallelMatching.scala @@ -5,7 +5,8 @@ */ // $Id$ -package scala.tools.nsc.matching +package scala.tools.nsc +package matching import util.Position import collection._ diff --git a/src/compiler/scala/tools/nsc/matching/PatternNodes.scala b/src/compiler/scala/tools/nsc/matching/PatternNodes.scala index 5c09de24ea..45b63463e9 100644 --- a/src/compiler/scala/tools/nsc/matching/PatternNodes.scala +++ b/src/compiler/scala/tools/nsc/matching/PatternNodes.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.matching +package scala.tools.nsc +package matching import scala.tools.nsc.util.{Position, NoPosition} diff --git a/src/compiler/scala/tools/nsc/matching/TransMatcher.scala b/src/compiler/scala/tools/nsc/matching/TransMatcher.scala index f7b3d27477..b37a762814 100644 --- a/src/compiler/scala/tools/nsc/matching/TransMatcher.scala +++ b/src/compiler/scala/tools/nsc/matching/TransMatcher.scala @@ -25,7 +25,8 @@ * 12 Regular Expression -- */ -package scala.tools.nsc.matching +package scala.tools.nsc +package matching import util.Position import ast.{ TreePrinters, Trees } diff --git a/src/compiler/scala/tools/nsc/models/Models.scala b/src/compiler/scala/tools/nsc/models/Models.scala index 0790bdbe43..1aafc5f658 100644 --- a/src/compiler/scala/tools/nsc/models/Models.scala +++ b/src/compiler/scala/tools/nsc/models/Models.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.models +package scala.tools.nsc +package models import scala.tools.nsc.Global import scala.tools.nsc.util.{Position,NoPosition} @@ -198,9 +199,9 @@ abstract class Models { def update0(members1: List[Tree]): Boolean = { // Console.err.println("update0 " + this + " " + members1) + // Martin: This is rather ugly code. We should use pattern matching here! if (members1.length == 1 && members1.head.isInstanceOf[PackageDef]) return update0(members1.head.asInstanceOf[PackageDef].stats) - val marked = new HashSet[HasTree] var updated = false for (mmbr1 <- members1) if (mmbr1.isInstanceOf[PackageDef]) { diff --git a/src/compiler/scala/tools/nsc/models/SemanticTokens.scala b/src/compiler/scala/tools/nsc/models/SemanticTokens.scala index 58d69b9628..b9e4046a41 100644 --- a/src/compiler/scala/tools/nsc/models/SemanticTokens.scala +++ b/src/compiler/scala/tools/nsc/models/SemanticTokens.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.models +package scala.tools.nsc +package models import java.lang.Character.isJavaIdentifierPart import java.lang.Thread @@ -344,7 +345,7 @@ class SemanticTokens(val compiler: Global) { } case sft : SelectFromTypeTree => build(sft.qualifier); // XXX: broken - if (false) Console.err.println("SFTT: " + sft + " sym=" + sft.symbol + " selector=" + sft.selector + " qual=" + sft.qualifier + " qual.sym=" + + if (false) Console.err.println("SFTT: " + sft + " sym=" + sft.symbol + " name=" + sft.name + " qual=" + sft.qualifier + " qual.sym=" + sft.qualifier.symbol + " qual.pos=" + (sft.qualifier.pos).dbgString + " symbol=" + sft.symbol + " type=" + tpe0 + " type.sym=" + tpe0.typeSymbol); diff --git a/src/compiler/scala/tools/nsc/models/Signatures.scala b/src/compiler/scala/tools/nsc/models/Signatures.scala index 05fffe58e1..98bfa142ff 100644 --- a/src/compiler/scala/tools/nsc/models/Signatures.scala +++ b/src/compiler/scala/tools/nsc/models/Signatures.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.models +package scala.tools.nsc +package models import scala.collection.mutable.{HashMap, HashSet} import scala.tools.nsc.{Global => Compiler} diff --git a/src/compiler/scala/tools/nsc/plugins/Plugin.scala b/src/compiler/scala/tools/nsc/plugins/Plugin.scala index 2e09c6e231..3013199c36 100644 --- a/src/compiler/scala/tools/nsc/plugins/Plugin.scala +++ b/src/compiler/scala/tools/nsc/plugins/Plugin.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.plugins +package scala.tools.nsc +package plugins import java.io.File import java.net.URLClassLoader diff --git a/src/compiler/scala/tools/nsc/plugins/PluginComponent.scala b/src/compiler/scala/tools/nsc/plugins/PluginComponent.scala index 30c6d9bcb4..1163ab9195 100644 --- a/src/compiler/scala/tools/nsc/plugins/PluginComponent.scala +++ b/src/compiler/scala/tools/nsc/plugins/PluginComponent.scala @@ -5,7 +5,8 @@ */ // $Id$ -package scala.tools.nsc.plugins +package scala.tools.nsc +package plugins /** A component that is part of a Plugin. * diff --git a/src/compiler/scala/tools/nsc/plugins/PluginDescription.scala b/src/compiler/scala/tools/nsc/plugins/PluginDescription.scala index a7d4c0e121..27355d061a 100644 --- a/src/compiler/scala/tools/nsc/plugins/PluginDescription.scala +++ b/src/compiler/scala/tools/nsc/plugins/PluginDescription.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.plugins +package scala.tools.nsc +package plugins import java.io.File diff --git a/src/compiler/scala/tools/nsc/plugins/PluginLoadException.scala b/src/compiler/scala/tools/nsc/plugins/PluginLoadException.scala index 5a147f5189..ce322122eb 100644 --- a/src/compiler/scala/tools/nsc/plugins/PluginLoadException.scala +++ b/src/compiler/scala/tools/nsc/plugins/PluginLoadException.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.plugins +package scala.tools.nsc +package plugins /** ... * diff --git a/src/compiler/scala/tools/nsc/plugins/Plugins.scala b/src/compiler/scala/tools/nsc/plugins/Plugins.scala index 812bfd7ce8..1163ae5a6a 100644 --- a/src/compiler/scala/tools/nsc/plugins/Plugins.scala +++ b/src/compiler/scala/tools/nsc/plugins/Plugins.scala @@ -5,7 +5,8 @@ */ // $Id$ -package scala.tools.nsc.plugins +package scala.tools.nsc +package plugins import java.io.File diff --git a/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala b/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala index 2228de95bf..aed42ca406 100644 --- a/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala +++ b/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.reporters +package scala.tools.nsc +package reporters import scala.collection.mutable.HashMap import scala.tools.nsc.Settings diff --git a/src/compiler/scala/tools/nsc/reporters/ConsoleReporter.scala b/src/compiler/scala/tools/nsc/reporters/ConsoleReporter.scala index 612a165620..4ee4a4fccc 100644 --- a/src/compiler/scala/tools/nsc/reporters/ConsoleReporter.scala +++ b/src/compiler/scala/tools/nsc/reporters/ConsoleReporter.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.reporters +package scala.tools.nsc +package reporters import java.io.{BufferedReader, InputStreamReader, IOException, PrintWriter} import util._ diff --git a/src/compiler/scala/tools/nsc/reporters/Reporter.scala b/src/compiler/scala/tools/nsc/reporters/Reporter.scala index e8fe26f1a0..dac52f8337 100644 --- a/src/compiler/scala/tools/nsc/reporters/Reporter.scala +++ b/src/compiler/scala/tools/nsc/reporters/Reporter.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.reporters +package scala.tools.nsc +package reporters import scala.tools.nsc.util._ diff --git a/src/compiler/scala/tools/nsc/reporters/ReporterTimer.scala b/src/compiler/scala/tools/nsc/reporters/ReporterTimer.scala index 33456bacce..3bce66df0a 100644 --- a/src/compiler/scala/tools/nsc/reporters/ReporterTimer.scala +++ b/src/compiler/scala/tools/nsc/reporters/ReporterTimer.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.reporters +package scala.tools.nsc +package reporters import scala.tools.util.AbstractTimer diff --git a/src/compiler/scala/tools/nsc/reporters/StoreReporter.scala b/src/compiler/scala/tools/nsc/reporters/StoreReporter.scala index d5993a3247..5239dabd60 100644 --- a/src/compiler/scala/tools/nsc/reporters/StoreReporter.scala +++ b/src/compiler/scala/tools/nsc/reporters/StoreReporter.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.reporters +package scala.tools.nsc +package reporters import java.io.{BufferedReader, InputStreamReader, IOException, PrintWriter} diff --git a/src/compiler/scala/tools/nsc/symtab/AnnotationCheckers.scala b/src/compiler/scala/tools/nsc/symtab/AnnotationCheckers.scala index ed54328e30..cc07d7896e 100644 --- a/src/compiler/scala/tools/nsc/symtab/AnnotationCheckers.scala +++ b/src/compiler/scala/tools/nsc/symtab/AnnotationCheckers.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.symtab +package scala.tools.nsc +package symtab /** Additions to the type checker that can be added at * run time. Typically these are added by diff --git a/src/compiler/scala/tools/nsc/symtab/AnnotationInfos.scala b/src/compiler/scala/tools/nsc/symtab/AnnotationInfos.scala index 0871e81c5e..13b3f752f5 100644 --- a/src/compiler/scala/tools/nsc/symtab/AnnotationInfos.scala +++ b/src/compiler/scala/tools/nsc/symtab/AnnotationInfos.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.symtab +package scala.tools.nsc +package symtab import scala.tools.nsc.transform.Reifiers import util._ diff --git a/src/compiler/scala/tools/nsc/symtab/BaseTypeSeqs.scala b/src/compiler/scala/tools/nsc/symtab/BaseTypeSeqs.scala index aa86d64222..949d1bf18f 100755 --- a/src/compiler/scala/tools/nsc/symtab/BaseTypeSeqs.scala +++ b/src/compiler/scala/tools/nsc/symtab/BaseTypeSeqs.scala @@ -2,7 +2,8 @@ * Copyright 2005-2009 LAMP/EPFL * @author Martin Odersky */ -package scala.tools.nsc.symtab +package scala.tools.nsc +package symtab // todo implement in terms of BitSet import scala.collection.mutable.ListBuffer diff --git a/src/compiler/scala/tools/nsc/symtab/Constants.scala b/src/compiler/scala/tools/nsc/symtab/Constants.scala index 2231aa32e9..5b1038f514 100644 --- a/src/compiler/scala/tools/nsc/symtab/Constants.scala +++ b/src/compiler/scala/tools/nsc/symtab/Constants.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.symtab +package scala.tools.nsc +package symtab import java.lang.Integer.toOctalString diff --git a/src/compiler/scala/tools/nsc/symtab/Definitions.scala b/src/compiler/scala/tools/nsc/symtab/Definitions.scala index dd8f1af927..a78c7cd067 100644 --- a/src/compiler/scala/tools/nsc/symtab/Definitions.scala +++ b/src/compiler/scala/tools/nsc/symtab/Definitions.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.symtab +package scala.tools.nsc +package symtab import scala.collection.mutable.{HashMap, HashSet} import scala.tools.nsc.util.{Position, NoPosition} diff --git a/src/compiler/scala/tools/nsc/symtab/Flags.scala b/src/compiler/scala/tools/nsc/symtab/Flags.scala index e6edef09f9..270c5820fe 100644 --- a/src/compiler/scala/tools/nsc/symtab/Flags.scala +++ b/src/compiler/scala/tools/nsc/symtab/Flags.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.symtab +package scala.tools.nsc +package symtab object Flags { diff --git a/src/compiler/scala/tools/nsc/symtab/IdeSupport.scala b/src/compiler/scala/tools/nsc/symtab/IdeSupport.scala index a96faf35ab..3a61095430 100644 --- a/src/compiler/scala/tools/nsc/symtab/IdeSupport.scala +++ b/src/compiler/scala/tools/nsc/symtab/IdeSupport.scala @@ -1,4 +1,5 @@ -package scala.tools.nsc.symtab +package scala.tools.nsc +package symtab import scala.tools.nsc.util._ import scala.collection.mutable._ import scala.tools.nsc.io._ @@ -643,7 +644,7 @@ trait IdeSupport extends SymbolTable { // added to global, not analyzers. // make the trees less detailed. override def sanitize(tree : Tree) : Tree = lightDuplicator.transform(tree match { case Template(_,vdef,_) => Template(Nil, sanitize(vdef).asInstanceOf[ValDef], Nil) - case PackageDef(nme, _) => PackageDef(nme, Nil) + case PackageDef(pid, _) => PackageDef(pid, Nil) case DefDef(mods, _, _, _, _:TypeTree, _) => DefDef(NoMods, nme.ERROR, Nil, Nil, TypeTree(), Literal(())) case DefDef(mods, _, _, _, restpt, _) => DefDef(NoMods, nme.ERROR, Nil, Nil, sanitize(restpt), Literal(())) case ValDef(_, _, _ : TypeTree, _) => ValDef(NoMods, nme.ERROR, TypeTree(), EmptyTree) diff --git a/src/compiler/scala/tools/nsc/symtab/InfoTransformers.scala b/src/compiler/scala/tools/nsc/symtab/InfoTransformers.scala index a27efe016a..d02063ca60 100644 --- a/src/compiler/scala/tools/nsc/symtab/InfoTransformers.scala +++ b/src/compiler/scala/tools/nsc/symtab/InfoTransformers.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.symtab +package scala.tools.nsc +package symtab trait InfoTransformers { self: SymbolTable => diff --git a/src/compiler/scala/tools/nsc/symtab/Names.scala b/src/compiler/scala/tools/nsc/symtab/Names.scala index c0fc5035c9..a4a4df5326 100644 --- a/src/compiler/scala/tools/nsc/symtab/Names.scala +++ b/src/compiler/scala/tools/nsc/symtab/Names.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.symtab +package scala.tools.nsc +package symtab import scala.util.NameTransformer import scala.io.UTF8Codec diff --git a/src/compiler/scala/tools/nsc/symtab/Scopes.scala b/src/compiler/scala/tools/nsc/symtab/Scopes.scala index cbe514d775..6170964a22 100644 --- a/src/compiler/scala/tools/nsc/symtab/Scopes.scala +++ b/src/compiler/scala/tools/nsc/symtab/Scopes.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.symtab +package scala.tools.nsc +package symtab trait Scopes { self: SymbolTable => diff --git a/src/compiler/scala/tools/nsc/symtab/StdNames.scala b/src/compiler/scala/tools/nsc/symtab/StdNames.scala index 65445b60d4..baeea7273a 100644 --- a/src/compiler/scala/tools/nsc/symtab/StdNames.scala +++ b/src/compiler/scala/tools/nsc/symtab/StdNames.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.symtab +package scala.tools.nsc +package symtab import scala.util.NameTransformer diff --git a/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala b/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala index ce20082095..c562b7ed09 100644 --- a/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala +++ b/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.symtab +package scala.tools.nsc +package symtab import java.io.{File, IOException} diff --git a/src/compiler/scala/tools/nsc/symtab/SymbolTable.scala b/src/compiler/scala/tools/nsc/symtab/SymbolTable.scala index 9b5872aba5..3ecd8f2a6e 100644 --- a/src/compiler/scala/tools/nsc/symtab/SymbolTable.scala +++ b/src/compiler/scala/tools/nsc/symtab/SymbolTable.scala @@ -4,8 +4,9 @@ */ // $Id$ -package scala.tools.nsc.symtab -import nsc.ast.Trees +package scala.tools.nsc +package symtab +import ast.Trees import util._ diff --git a/src/compiler/scala/tools/nsc/symtab/SymbolWalker.scala b/src/compiler/scala/tools/nsc/symtab/SymbolWalker.scala index d93b69c135..69481067d4 100644 --- a/src/compiler/scala/tools/nsc/symtab/SymbolWalker.scala +++ b/src/compiler/scala/tools/nsc/symtab/SymbolWalker.scala @@ -1,4 +1,5 @@ -package scala.tools.nsc.symtab +package scala.tools.nsc +package symtab trait SymbolWalker { val global : Global diff --git a/src/compiler/scala/tools/nsc/symtab/Symbols.scala b/src/compiler/scala/tools/nsc/symtab/Symbols.scala index b5b68a554d..05c0614620 100644 --- a/src/compiler/scala/tools/nsc/symtab/Symbols.scala +++ b/src/compiler/scala/tools/nsc/symtab/Symbols.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.nsc.symtab +package scala.tools.nsc +package symtab import scala.collection.mutable.ListBuffer import scala.collection.immutable.Map diff --git a/src/compiler/scala/tools/nsc/symtab/Types.scala b/src/compiler/scala/tools/nsc/symtab/Types.scala index 8547d49533..f8188246f8 100644 --- a/src/compiler/scala/tools/nsc/symtab/Types.scala +++ b/src/compiler/scala/tools/nsc/symtab/Types.scala @@ -4,7 +4,8 @@ */ // -package scala.tools.nsc.symtab +package scala.tools.nsc +package symtab import scala.collection.immutable import scala.collection.mutable.{ListBuffer, HashMap, WeakHashMap} diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/AbstractFileReader.scala b/src/compiler/scala/tools/nsc/symtab/classfile/AbstractFileReader.scala index 19b24d0f67..7a789fcb32 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/AbstractFileReader.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/AbstractFileReader.scala @@ -5,7 +5,9 @@ // $Id$ -package scala.tools.nsc.symtab.classfile +package scala.tools.nsc +package symtab +package classfile import java.lang.Float.intBitsToFloat import java.lang.Double.longBitsToDouble diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileConstants.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileConstants.scala index 6b16cdddcb..34cc85b8ef 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileConstants.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileConstants.scala @@ -4,7 +4,9 @@ */ // $Id$ -package scala.tools.nsc.symtab.classfile +package scala.tools.nsc +package symtab +package classfile object ClassfileConstants { diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala index 9f042e5aa7..4a9eb4cdfd 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala @@ -4,7 +4,9 @@ */ // $Id$ -package scala.tools.nsc.symtab.classfile +package scala.tools.nsc +package symtab +package classfile import java.io.IOException import java.lang.Integer.toHexString diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala index 64e8ccc0ee..c52cc3e796 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala @@ -4,7 +4,9 @@ */ // $Id$ -package scala.tools.nsc.symtab.classfile +package scala.tools.nsc +package symtab +package classfile import java.io.IOException diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/MetaParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/MetaParser.scala index 905a473a96..58baf9139f 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/MetaParser.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/MetaParser.scala @@ -4,7 +4,9 @@ */ // $Id$ -package scala.tools.nsc.symtab.classfile +package scala.tools.nsc +package symtab +package classfile import java.util.{StringTokenizer, NoSuchElementException} diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/PickleBuffer.scala b/src/compiler/scala/tools/nsc/symtab/classfile/PickleBuffer.scala index 608857d3e0..b02ae0b4b5 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/PickleBuffer.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/PickleBuffer.scala @@ -4,7 +4,9 @@ */ // $Id$ -package scala.tools.nsc.symtab.classfile +package scala.tools.nsc +package symtab +package classfile /** Variable length byte arrays, with methods for basic pickling and unpickling. * diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/PickleFormat.scala b/src/compiler/scala/tools/nsc/symtab/classfile/PickleFormat.scala index 0b0b7216b9..aef29b0b21 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/PickleFormat.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/PickleFormat.scala @@ -4,7 +4,9 @@ */ // $Id$ -package scala.tools.nsc.symtab.classfile +package scala.tools.nsc +package symtab +package classfile /** This object provides constants for pickling attributes. * diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala b/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala index 4a0b21a914..471754dc4a 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala @@ -4,7 +4,9 @@ */ // $Id$ -package scala.tools.nsc.symtab.classfile +package scala.tools.nsc +package symtab +package classfile import java.lang.{Float, Double} import scala.tools.nsc.util.{Position, NoPosition, ShowPickled} @@ -210,8 +212,8 @@ abstract class Pickler extends SubComponent { tree match { case EmptyTree => - case tree@PackageDef(name, stats) => - putEntry(name) + case tree@PackageDef(pid, stats) => + putTree(pid) putTrees(stats) case ClassDef(mods, name, tparams, impl) => @@ -622,12 +624,12 @@ abstract class Pickler extends SubComponent { writeNat(EMPTYtree) TREE - case tree@PackageDef(name, stats) => + case tree@PackageDef(pid, stats) => writeNat(PACKAGEtree) writeRef(tree.tpe) writeRef(tree.symbol) writeRef(tree.mods) - writeRef(name) + writeRef(pid) writeRefs(stats) TREE diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/UnPickler.scala b/src/compiler/scala/tools/nsc/symtab/classfile/UnPickler.scala index 8122177365..f2aa736656 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/UnPickler.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/UnPickler.scala @@ -4,7 +4,9 @@ */ // $Id$ -package scala.tools.nsc.symtab.classfile +package scala.tools.nsc +package symtab +package classfile import java.io.IOException import java.lang.{Float, Double} @@ -457,9 +459,9 @@ abstract class UnPickler { case PACKAGEtree => val symbol = readSymbolRef() - val name = readNameRef() + val pid = readTreeRef().asInstanceOf[RefTree] val stats = until(end, readTreeRef) - PackageDef(name, stats) setType tpe + PackageDef(pid, stats) setType tpe case CLASStree => val symbol = readSymbolRef() diff --git a/src/compiler/scala/tools/nsc/symtab/clr/CLRTypes.scala b/src/compiler/scala/tools/nsc/symtab/clr/CLRTypes.scala index a0c2b07176..d80d3d90e4 100644 --- a/src/compiler/scala/tools/nsc/symtab/clr/CLRTypes.scala +++ b/src/compiler/scala/tools/nsc/symtab/clr/CLRTypes.scala @@ -4,7 +4,9 @@ // $Id$ -package scala.tools.nsc.symtab.clr +package scala.tools.nsc +package symtab +package clr import java.io.File import java.util.{Comparator, StringTokenizer} diff --git a/src/compiler/scala/tools/nsc/symtab/clr/TypeParser.scala b/src/compiler/scala/tools/nsc/symtab/clr/TypeParser.scala index 5b47dc50eb..9b621a9596 100644 --- a/src/compiler/scala/tools/nsc/symtab/clr/TypeParser.scala +++ b/src/compiler/scala/tools/nsc/symtab/clr/TypeParser.scala @@ -4,7 +4,9 @@ // $Id$ -package scala.tools.nsc.symtab.clr +package scala.tools.nsc +package symtab +package clr import java.io.IOException diff --git a/src/compiler/scala/tools/nsc/transform/AddInterfaces.scala b/src/compiler/scala/tools/nsc/transform/AddInterfaces.scala index e95c8b69bd..64b9740839 100644 --- a/src/compiler/scala/tools/nsc/transform/AddInterfaces.scala +++ b/src/compiler/scala/tools/nsc/transform/AddInterfaces.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.transform +package scala.tools.nsc +package transform import symtab._ import Flags._ diff --git a/src/compiler/scala/tools/nsc/transform/CleanUp.scala b/src/compiler/scala/tools/nsc/transform/CleanUp.scala index 942871ae1f..348f3cc5a3 100644 --- a/src/compiler/scala/tools/nsc/transform/CleanUp.scala +++ b/src/compiler/scala/tools/nsc/transform/CleanUp.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.transform +package scala.tools.nsc +package transform import symtab._ import Flags._ diff --git a/src/compiler/scala/tools/nsc/transform/Constructors.scala b/src/compiler/scala/tools/nsc/transform/Constructors.scala index 0331766b80..d8f0290507 100644 --- a/src/compiler/scala/tools/nsc/transform/Constructors.scala +++ b/src/compiler/scala/tools/nsc/transform/Constructors.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.transform +package scala.tools.nsc +package transform import scala.collection.mutable.ListBuffer import symtab.Flags._ diff --git a/src/compiler/scala/tools/nsc/transform/Erasure.scala b/src/compiler/scala/tools/nsc/transform/Erasure.scala index 2b9b66b0ff..1fa2ba58d2 100644 --- a/src/compiler/scala/tools/nsc/transform/Erasure.scala +++ b/src/compiler/scala/tools/nsc/transform/Erasure.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.transform +package scala.tools.nsc +package transform import scala.tools.nsc.symtab.classfile.ClassfileConstants._ import scala.collection.mutable.{HashMap,ListBuffer} diff --git a/src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala b/src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala index f838de7fe5..42a8f3848a 100644 --- a/src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala +++ b/src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.transform +package scala.tools.nsc +package transform import symtab._ import Flags.{ CASE => _, _ } diff --git a/src/compiler/scala/tools/nsc/transform/Flatten.scala b/src/compiler/scala/tools/nsc/transform/Flatten.scala index fa1c08f80f..7738692a29 100644 --- a/src/compiler/scala/tools/nsc/transform/Flatten.scala +++ b/src/compiler/scala/tools/nsc/transform/Flatten.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.transform +package scala.tools.nsc +package transform import symtab._ import Flags._ diff --git a/src/compiler/scala/tools/nsc/transform/InfoTransform.scala b/src/compiler/scala/tools/nsc/transform/InfoTransform.scala index ba4ce36c33..42c2d1ee43 100644 --- a/src/compiler/scala/tools/nsc/transform/InfoTransform.scala +++ b/src/compiler/scala/tools/nsc/transform/InfoTransform.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.transform +package scala.tools.nsc +package transform /** <p> * A base class for transforms. diff --git a/src/compiler/scala/tools/nsc/transform/LambdaLift.scala b/src/compiler/scala/tools/nsc/transform/LambdaLift.scala index 9cf11f2284..b64451a3cd 100644 --- a/src/compiler/scala/tools/nsc/transform/LambdaLift.scala +++ b/src/compiler/scala/tools/nsc/transform/LambdaLift.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.transform +package scala.tools.nsc +package transform import symtab._ import Flags._ diff --git a/src/compiler/scala/tools/nsc/transform/LazyVals.scala b/src/compiler/scala/tools/nsc/transform/LazyVals.scala index e8db58c2bc..16c5f8754d 100644 --- a/src/compiler/scala/tools/nsc/transform/LazyVals.scala +++ b/src/compiler/scala/tools/nsc/transform/LazyVals.scala @@ -1,4 +1,5 @@ -package scala.tools.nsc.transform; +package scala.tools.nsc +package transform; import scala.tools.nsc._ import scala.collection.mutable.HashMap diff --git a/src/compiler/scala/tools/nsc/transform/LiftCode.scala b/src/compiler/scala/tools/nsc/transform/LiftCode.scala index 34faa7f683..b2af3a0d73 100644 --- a/src/compiler/scala/tools/nsc/transform/LiftCode.scala +++ b/src/compiler/scala/tools/nsc/transform/LiftCode.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.transform +package scala.tools.nsc +package transform import symtab._ import Flags._ @@ -120,7 +121,7 @@ abstract class LiftCode extends Transform with Reifiers { // case EmptyTree => // case LiftPoint(tree) => -// case PackageDef(name, stats) => +// case PackageDef(pid, stats) => // case ClassDef(mods, name, tparams, impl) => // case ValDef(mods, name, tpt, rhs) => // case DefDef(mods, name, tparams, vparamss, tpt, rhs) => diff --git a/src/compiler/scala/tools/nsc/transform/Mixin.scala b/src/compiler/scala/tools/nsc/transform/Mixin.scala index 29d182b61e..c02d2cd27d 100644 --- a/src/compiler/scala/tools/nsc/transform/Mixin.scala +++ b/src/compiler/scala/tools/nsc/transform/Mixin.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.transform +package scala.tools.nsc +package transform import symtab._ import Flags._ diff --git a/src/compiler/scala/tools/nsc/transform/OverridingPairs.scala b/src/compiler/scala/tools/nsc/transform/OverridingPairs.scala index 8f8d6a5bea..2eb63cd52d 100644 --- a/src/compiler/scala/tools/nsc/transform/OverridingPairs.scala +++ b/src/compiler/scala/tools/nsc/transform/OverridingPairs.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.transform +package scala.tools.nsc +package transform import collection.mutable.HashMap import symtab.Flags._ diff --git a/src/compiler/scala/tools/nsc/transform/Reifiers.scala b/src/compiler/scala/tools/nsc/transform/Reifiers.scala index 37a0ebcc1b..d4290bff59 100644 --- a/src/compiler/scala/tools/nsc/transform/Reifiers.scala +++ b/src/compiler/scala/tools/nsc/transform/Reifiers.scala @@ -1,4 +1,5 @@ -package scala.tools.nsc.transform +package scala.tools.nsc +package transform import scala.tools.nsc.symtab.SymbolTable import scala.reflect import collection.mutable.HashMap diff --git a/src/compiler/scala/tools/nsc/transform/SampleTransform.scala b/src/compiler/scala/tools/nsc/transform/SampleTransform.scala index ad4e322ab1..33d454534f 100644 --- a/src/compiler/scala/tools/nsc/transform/SampleTransform.scala +++ b/src/compiler/scala/tools/nsc/transform/SampleTransform.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.transform +package scala.tools.nsc +package transform /** A sample transform. */ diff --git a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala index 7ac989374b..d1ca4de2ca 100644 --- a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala +++ b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala @@ -1,4 +1,5 @@ -package scala.tools.nsc.transform +package scala.tools.nsc +package transform import scala.tools.nsc.symtab.Flags import scala.tools.nsc.util.FreshNameCreator @@ -899,12 +900,12 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers { } else super.transform(tree) - case PackageDef(name, stats) => + case PackageDef(pid, stats) => tree.symbol.info // make sure specializations have been peformed log("PackageDef owner: " + symbol) atOwner(tree, symbol) { val specMembers = implSpecClasses(stats) map localTyper.typed - treeCopy.PackageDef(tree, name, transformStats(stats ::: specMembers, symbol.moduleClass)) + treeCopy.PackageDef(tree, pid, transformStats(stats ::: specMembers, symbol.moduleClass)) } case Template(parents, self, body) => diff --git a/src/compiler/scala/tools/nsc/transform/TailCalls.scala b/src/compiler/scala/tools/nsc/transform/TailCalls.scala index 56f4cce69f..0d8540e196 100644 --- a/src/compiler/scala/tools/nsc/transform/TailCalls.scala +++ b/src/compiler/scala/tools/nsc/transform/TailCalls.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.transform +package scala.tools.nsc +package transform import scala.tools.nsc.symtab.Flags @@ -203,7 +204,7 @@ abstract class TailCalls extends Transform case EmptyTree => tree - case PackageDef(name, stats) => + case PackageDef(_, _) => super.transform(tree) case ClassDef(_, name, _, _) => diff --git a/src/compiler/scala/tools/nsc/transform/Transform.scala b/src/compiler/scala/tools/nsc/transform/Transform.scala index eb3c791430..e3a8dd0659 100644 --- a/src/compiler/scala/tools/nsc/transform/Transform.scala +++ b/src/compiler/scala/tools/nsc/transform/Transform.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.transform +package scala.tools.nsc +package transform /** <p> * A base class for transforms. diff --git a/src/compiler/scala/tools/nsc/transform/TypingTransformers.scala b/src/compiler/scala/tools/nsc/transform/TypingTransformers.scala index ee3230c5fa..ac72383195 100644 --- a/src/compiler/scala/tools/nsc/transform/TypingTransformers.scala +++ b/src/compiler/scala/tools/nsc/transform/TypingTransformers.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.transform +package scala.tools.nsc +package transform import util.Position import scala.collection.mutable.{Map, HashMap} diff --git a/src/compiler/scala/tools/nsc/transform/UnCurry.scala b/src/compiler/scala/tools/nsc/transform/UnCurry.scala index abf80658a9..3306b1f63a 100644 --- a/src/compiler/scala/tools/nsc/transform/UnCurry.scala +++ b/src/compiler/scala/tools/nsc/transform/UnCurry.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.transform +package scala.tools.nsc +package transform import symtab.Flags._ import scala.collection.mutable.{HashMap, HashSet} diff --git a/src/compiler/scala/tools/nsc/typechecker/Analyzer.scala b/src/compiler/scala/tools/nsc/typechecker/Analyzer.scala index 16287bfc45..a7b00894dd 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Analyzer.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Analyzer.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.typechecker +package scala.tools.nsc +package typechecker /** The main attribution phase. */ diff --git a/src/compiler/scala/tools/nsc/typechecker/ConstantFolder.scala b/src/compiler/scala/tools/nsc/typechecker/ConstantFolder.scala index ec8de3f1e9..a46a987bb8 100644 --- a/src/compiler/scala/tools/nsc/typechecker/ConstantFolder.scala +++ b/src/compiler/scala/tools/nsc/typechecker/ConstantFolder.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.typechecker +package scala.tools.nsc +package typechecker import java.lang.ArithmeticException diff --git a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala index 114525aabc..bd969eb13f 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.typechecker +package scala.tools.nsc +package typechecker import symtab.Flags._ import scala.tools.nsc.util.{Position,NoPosition} @@ -390,8 +391,9 @@ trait Contexts { self: Analyzer => */ def isAccessible(sym: Symbol, pre: Type, superAccess: Boolean): Boolean = { - /** Are we inside definition of `owner'? */ - def accessWithin(owner: Symbol): Boolean = { + /** Are we inside definition of `sym'? */ + def accessWithin(sym: Symbol): Boolean = this.owner.ownerChain contains sym +/* var c = this while (c != NoContext && c.owner != owner) { if (c.outer eq null) assert(false, "accessWithin(" + owner + ") " + c);//debug @@ -400,7 +402,7 @@ trait Contexts { self: Analyzer => } c != NoContext } - +*/ /** Is `clazz' a subclass of an enclosing class? */ def isSubClassOfEnclosing(clazz: Symbol): Boolean = enclosingSuperClassContext(clazz) != NoContext diff --git a/src/compiler/scala/tools/nsc/typechecker/DeVirtualize.scala b/src/compiler/scala/tools/nsc/typechecker/DeVirtualize.scala index 5bb1016412..2714e72640 100644 --- a/src/compiler/scala/tools/nsc/typechecker/DeVirtualize.scala +++ b/src/compiler/scala/tools/nsc/typechecker/DeVirtualize.scala @@ -4,7 +4,8 @@ */ // $Id: RefChecks.scala 13735 2008-01-18 17:18:58Z odersky $ -package scala.tools.nsc.typechecker +package scala.tools.nsc +package typechecker import symtab.Flags._ import transform.{InfoTransform, TypingTransformers} diff --git a/src/compiler/scala/tools/nsc/typechecker/Duplicators.scala b/src/compiler/scala/tools/nsc/typechecker/Duplicators.scala index b20b7c97bd..8a4a6129fb 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Duplicators.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Duplicators.scala @@ -1,4 +1,5 @@ -package scala.tools.nsc.typechecker +package scala.tools.nsc +package typechecker import scala.tools.nsc.symtab.Flags diff --git a/src/compiler/scala/tools/nsc/typechecker/EtaExpansion.scala b/src/compiler/scala/tools/nsc/typechecker/EtaExpansion.scala index 5f74567f2b..118e06bf6a 100644 --- a/src/compiler/scala/tools/nsc/typechecker/EtaExpansion.scala +++ b/src/compiler/scala/tools/nsc/typechecker/EtaExpansion.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.typechecker +package scala.tools.nsc +package typechecker import scala.collection.mutable.ListBuffer import symtab.Flags._ diff --git a/src/compiler/scala/tools/nsc/typechecker/IdeSupport.scala b/src/compiler/scala/tools/nsc/typechecker/IdeSupport.scala index 6d5ad19f5c..db48683213 100644 --- a/src/compiler/scala/tools/nsc/typechecker/IdeSupport.scala +++ b/src/compiler/scala/tools/nsc/typechecker/IdeSupport.scala @@ -1,4 +1,5 @@ -package scala.tools.nsc.typechecker; +package scala.tools.nsc +package typechecker; import scala.collection.mutable.{WeakHashMap, LinkedHashSet} trait IdeSupport extends Analyzer { val global : Global with symtab.IdeSupport @@ -99,6 +100,7 @@ trait IdeSupport extends Analyzer { } override def newTyper(txt : Context) : Typer = new Typer(txt) class Typer(context : Context) extends super.Typer(context) { + /* !!! Miles, do we need still this? It's broken as it is because we have to return a Symbol not a Context override def qualifyingClassContext(tree: Tree, qual: Name, packageOK: Boolean): Context = { if (qual.isEmpty) super.qualifyingClassContext(tree, qual, packageOK) else { @@ -116,6 +118,7 @@ trait IdeSupport extends Analyzer { c } } + */ // no adapting. override protected def adapt(tree: Tree, mode: Int, pt: Type): Tree = super.adapt(tree,mode,pt) override def typed1(tree: Tree, mode: Int, pt: Type): Tree = tree match { diff --git a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala index d24f641fb4..ee640ef749 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala @@ -8,7 +8,8 @@ //todo: use inherited type info also for vars and values //todo: disallow C#D in superclass //todo: treat :::= correctly -package scala.tools.nsc.typechecker +package scala.tools.nsc +package typechecker import scala.collection.mutable.{LinkedHashMap, ListBuffer} import scala.tools.nsc.util.{HashSet, Position, Set, NoPosition, SourceFile} diff --git a/src/compiler/scala/tools/nsc/typechecker/Infer.scala b/src/compiler/scala/tools/nsc/typechecker/Infer.scala index ce16b55001..25956b2a29 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Infer.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Infer.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.typechecker +package scala.tools.nsc +package typechecker import scala.tools.nsc.util.{Position, NoPosition} import scala.collection.mutable.ListBuffer import scala.util.control.ControlException diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala index 6268db7024..0bc9d4d0f6 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.typechecker +package scala.tools.nsc +package typechecker import scala.collection.mutable.HashMap import scala.tools.nsc.util.Position @@ -70,7 +71,7 @@ trait Namers { self: Analyzer => def setPrivateWithin[Sym <: Symbol](tree: Tree, sym: Sym, mods: Modifiers): Sym = { if (!mods.privateWithin.isEmpty) - sym.privateWithin = typer.qualifyingClassContext(tree, mods.privateWithin, true).owner + sym.privateWithin = typer.qualifyingClass(tree, mods.privateWithin, true) sym } @@ -175,19 +176,21 @@ trait Namers { self: Analyzer => } else scope enter sym } - def enterPackageSymbol(pos: Position, name: Name): Symbol = { - val (cscope, cowner) = - if (context.owner == EmptyPackageClass) (RootClass.info.decls, RootClass) - else (context.scope, context.owner) - val p: Symbol = cscope.lookupWithContext(name)(context.owner) - if (p.isPackage && cscope == p.owner.info.decls) { - p - } else { - val pkg = cowner.newPackage(pos, name) + def enterPackageSymbol(pos: Position, pid: RefTree, pkgOwner: Symbol): Symbol = { + val owner = pid match { + case Ident(name) => + pkgOwner + case Select(qual: RefTree, name) => + enterPackageSymbol(pos, qual, pkgOwner).moduleClass + } + var pkg = owner.info.decls.lookupWithContext(pid.name)(owner) + if (!pkg.isPackage || owner != pkg.owner) { + pkg = owner.newPackage(pos, pid.name) pkg.moduleClass.setInfo(new PackageClassInfoType(newScope, pkg.moduleClass, null)) pkg.setInfo(pkg.moduleClass.tpe) - enterInScope(pkg, cscope) + enterInScope(pkg, owner.info.decls) } + pkg } def enterClassSymbol(tree : ClassDef): Symbol = { @@ -324,8 +327,9 @@ trait Namers { self: Analyzer => if (tree.symbol == NoSymbol) { val owner = context.owner tree match { - case PackageDef(name, stats) => - tree.symbol = enterPackageSymbol(tree.pos, name) + case PackageDef(pid, stats) => + tree.symbol = enterPackageSymbol(tree.pos, pid, + if (context.owner == EmptyPackageClass) RootClass else context.owner) val namer = newNamer( context.make(tree, tree.symbol.moduleClass, tree.symbol.info.decls)) namer.enterSyms(stats) diff --git a/src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala b/src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala index e8750104f0..830503d37a 100644 --- a/src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala +++ b/src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala @@ -4,7 +4,8 @@ */ // $Id: NamesDefaults.scala 17081 2009-02-10 17:45:38Z rytz $ -package scala.tools.nsc.typechecker +package scala.tools.nsc +package typechecker import scala.collection.mutable.ListBuffer import symtab.Flags._ diff --git a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala index 4c2be9c247..3e85a55e61 100644 --- a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala +++ b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.typechecker +package scala.tools.nsc +package typechecker import symtab.Flags._ import collection.mutable.{HashSet, HashMap} diff --git a/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala b/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala index f19cdd7d95..c5976a6f3f 100644 --- a/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala +++ b/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala @@ -4,11 +4,12 @@ */ // $Id$ -package scala.tools.nsc.typechecker +package scala.tools.nsc +package typechecker import scala.collection.mutable.ListBuffer -import nsc.symtab.Flags._ -import scala.tools.nsc.util.{Position} +import symtab.Flags._ +import util.Position /** This phase adds super accessors for all super calls that * either appear in a trait or have as a target a member of some outer class. diff --git a/src/compiler/scala/tools/nsc/typechecker/SyntheticMethods.scala b/src/compiler/scala/tools/nsc/typechecker/SyntheticMethods.scala index 2fdd049bc5..23f90b1b8e 100644 --- a/src/compiler/scala/tools/nsc/typechecker/SyntheticMethods.scala +++ b/src/compiler/scala/tools/nsc/typechecker/SyntheticMethods.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.typechecker +package scala.tools.nsc +package typechecker import symtab.Flags import symtab.Flags._ diff --git a/src/compiler/scala/tools/nsc/typechecker/TreeCheckers.scala b/src/compiler/scala/tools/nsc/typechecker/TreeCheckers.scala index e6c9a14380..3e8e803c13 100644 --- a/src/compiler/scala/tools/nsc/typechecker/TreeCheckers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/TreeCheckers.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.typechecker +package scala.tools.nsc +package typechecker import scala.tools.nsc.symtab.Flags._ import scala.tools.nsc.util.{Position, NoPosition} diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index 7c1e072849..3b9ebf53b8 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -8,7 +8,8 @@ //todo: use inherited type info also for vars and values //todo: disallow C#D in superclass //todo: treat :::= correctly -package scala.tools.nsc.typechecker +package scala.tools.nsc +package typechecker import scala.collection.mutable.{HashMap, ListBuffer} import scala.util.control.ControlException @@ -516,24 +517,20 @@ trait Typers { self: Analyzer => tparam.symbol.deSkolemize } - /** The qualifying class of a this or super with prefix <code>qual</code>. - * - * @param tree ... - * @param qual ... - * @return ... + /** The qualifying class + * of a this or super with prefix <code>qual</code>. */ - def qualifyingClassContext(tree: Tree, qual: Name, packageOK: Boolean): Context = { - var c = context.enclClass - if (!qual.isEmpty) { - while (c != NoContext && c.owner.name != qual) c = c.outer.enclClass - } - if (c == NoContext || !(packageOK || c.enclClass.tree.isInstanceOf[Template])) - error( - tree.pos, - if (qual.isEmpty) tree+" can be used only in a class, object, or template" - else qual+" is not an enclosing class") - c - } + def qualifyingClass(tree: Tree, qual: Name, packageOK: Boolean): Symbol = + context.enclClass.owner.ownerChain.find(o => qual.isEmpty || o.isClass && o.name == qual) match { + case Some(c) if packageOK || !c.isPackageClass => + c + case _ => + error( + tree.pos, + if (qual.isEmpty) tree+" can be used only in a class, object, or template" + else qual+" is not an enclosing class") + NoSymbol + } /** The typer for an expression, depending on where we are. If we are before a superclass * call, this is a typer over a constructor context; otherwise it is the current typer. @@ -1750,11 +1747,9 @@ trait Typers { self: Analyzer => def typedStats(stats: List[Tree], exprOwner: Symbol): List[Tree] = { val inBlock = exprOwner == context.owner - val localTarget = - context.unit != null && - context.unit.targetPos != NoPosition && - (stats exists (context.unit.targetPos includes _.pos)) - + def includesTargetPos(tree: Tree) = + !tree.pos.isSynthetic && context.unit != null && (tree.pos includes context.unit.targetPos) + val localTarget = stats exists includesTargetPos def typedStat(stat: Tree): Tree = { if (context.owner.isRefinementClass && !treeInfo.isDeclaration(stat)) errorTree(stat, "only declarations allowed here") @@ -1768,7 +1763,7 @@ trait Typers { self: Analyzer => } EmptyTree case _ => - if (localTarget && !(context.unit.targetPos includes stat.pos)) { + if (localTarget && !includesTargetPos(tree)) stat } else { val localTyper = if (inBlock || (stat.isDef && !stat.isInstanceOf[LabelDef])) this @@ -2272,8 +2267,7 @@ trait Typers { self: Analyzer => * * @param annClass the expected annotation class */ - def typedAnnotation(ann: Tree, mode: Int = EXPRmode, selfsym: Symbol = NoSymbol, - annClass: Symbol = AnnotationClass, requireJava: Boolean = false): AnnotationInfo = { + def typedAnnotation(ann: Tree, mode: Int = EXPRmode, selfsym: Symbol = NoSymbol, annClass: Symbol = AnnotationClass, requireJava: Boolean = false): AnnotationInfo = { lazy val annotationError = AnnotationInfo(ErrorType, Nil, Nil) var hasError: Boolean = false def error(pos: Position, msg: String) = { @@ -3148,14 +3142,11 @@ trait Typers { self: Analyzer => */ } + def qualifyingClassSym(qual: Name): Symbol = + if (tree.symbol != NoSymbol) tree.symbol else qualifyingClass(tree, qual, false) + def typedSuper(qual: Name, mix: Name) = { - val (clazz, selftype) = - if (tree.symbol != NoSymbol) { - (tree.symbol, tree.symbol.thisType) - } else { - val clazzContext = qualifyingClassContext(tree, qual, false) - (clazzContext.owner, clazzContext.prefix) - } + val clazz = qualifyingClassSym(qual) if (clazz == NoSymbol) setError(tree) else { def findMixinSuper(site: Type): Type = { @@ -3186,27 +3177,20 @@ trait Typers { self: Analyzer => } else { findMixinSuper(clazz.info) } - tree setSymbol clazz setType mkSuperType(selftype, owntype) + tree setSymbol clazz setType mkSuperType(clazz.thisType, owntype) } } def typedThis(qual: Name) = { - val (clazz, selftype) = - if (tree.symbol != NoSymbol) { - (tree.symbol, tree.symbol.thisType) - } else { - val clazzContext = qualifyingClassContext(tree, qual, false) - (clazzContext.owner, clazzContext.prefix) - } + val clazz = qualifyingClassSym(qual) if (clazz == NoSymbol) setError(tree) else { - tree setSymbol clazz setType selftype.underlying - if (isStableContext(tree, mode, pt)) tree setType selftype + tree setSymbol clazz setType clazz.thisType.underlying + if (isStableContext(tree, mode, pt)) tree setType clazz.thisType tree } } - /** Attribute a selection where <code>tree</code> is <code>qual.name</code>. * <code>qual</code> is already attributed. * @@ -3485,11 +3469,12 @@ trait Typers { self: Analyzer => if ((sym ne null) && (sym ne NoSymbol)) sym.initialize //if (settings.debug.value && tree.isDef) log("typing definition of "+sym);//DEBUG tree match { - case PackageDef(name, stats) => + case PackageDef(pid, stats) => + val pid1 = typedQualifier(pid).asInstanceOf[RefTree] assert(sym.moduleClass ne NoSymbol, sym) val stats1 = newTyper(context.make(tree, sym.moduleClass, sym.info.decls)) .typedStats(stats, NoSymbol) - treeCopy.PackageDef(tree, name, stats1) setType NoType + treeCopy.PackageDef(tree, pid1, stats1) setType NoType case tree @ ClassDef(_, _, _, _) => newTyper(context.makeNewScope(tree, sym)).typedClassDef(tree) diff --git a/src/compiler/scala/tools/nsc/typechecker/Unapplies.scala b/src/compiler/scala/tools/nsc/typechecker/Unapplies.scala index e1d13a5253..74c51405e4 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Unapplies.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Unapplies.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.typechecker +package scala.tools.nsc +package typechecker import symtab.Flags._ diff --git a/src/compiler/scala/tools/nsc/typechecker/Variances.scala b/src/compiler/scala/tools/nsc/typechecker/Variances.scala index 22a90e7542..6e2d61b94c 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Variances.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Variances.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.typechecker +package scala.tools.nsc +package typechecker import symtab.Flags._ diff --git a/src/compiler/scala/tools/nsc/util/ArgumentsExpander.scala b/src/compiler/scala/tools/nsc/util/ArgumentsExpander.scala index 68aa3479d2..2d8fc8c502 100644 --- a/src/compiler/scala/tools/nsc/util/ArgumentsExpander.scala +++ b/src/compiler/scala/tools/nsc/util/ArgumentsExpander.scala @@ -1,4 +1,5 @@ -package scala.tools.nsc.util +package scala.tools.nsc +package util import java.io.{FileReader, BufferedReader, StreamTokenizer, FileNotFoundException} import scala.tools.nsc.io.AbstractFile diff --git a/src/compiler/scala/tools/nsc/util/BitSet.scala b/src/compiler/scala/tools/nsc/util/BitSet.scala index ce83fb8a10..52856afb82 100644 --- a/src/compiler/scala/tools/nsc/util/BitSet.scala +++ b/src/compiler/scala/tools/nsc/util/BitSet.scala @@ -1,4 +1,5 @@ -package scala.tools.nsc.util +package scala.tools.nsc +package util import BitSet._ diff --git a/src/compiler/scala/tools/nsc/util/CharArrayReader.scala b/src/compiler/scala/tools/nsc/util/CharArrayReader.scala index a6b59cdcae..99883d9f7d 100755 --- a/src/compiler/scala/tools/nsc/util/CharArrayReader.scala +++ b/src/compiler/scala/tools/nsc/util/CharArrayReader.scala @@ -4,7 +4,8 @@ */ // $Id: NewCharArrayReader.scala 16893 2009-01-13 13:09:22Z cunei $ -package scala.tools.nsc.util +package scala.tools.nsc +package util import scala.tools.nsc.util.SourceFile.{LF, FF, CR, SU} diff --git a/src/compiler/scala/tools/nsc/util/ClassPath.scala b/src/compiler/scala/tools/nsc/util/ClassPath.scala index 93be056455..081a4a4bd9 100644 --- a/src/compiler/scala/tools/nsc/util/ClassPath.scala +++ b/src/compiler/scala/tools/nsc/util/ClassPath.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.nsc.util +package scala.tools.nsc +package util import java.io.File import java.net.URL diff --git a/src/compiler/scala/tools/nsc/util/FreshNameCreator.scala b/src/compiler/scala/tools/nsc/util/FreshNameCreator.scala index 87c00e7b3d..ac325042da 100644 --- a/src/compiler/scala/tools/nsc/util/FreshNameCreator.scala +++ b/src/compiler/scala/tools/nsc/util/FreshNameCreator.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.util +package scala.tools.nsc +package util import scala.collection.mutable.HashMap diff --git a/src/compiler/scala/tools/nsc/util/HashSet.scala b/src/compiler/scala/tools/nsc/util/HashSet.scala index 593b82da7f..d17850ebf5 100644 --- a/src/compiler/scala/tools/nsc/util/HashSet.scala +++ b/src/compiler/scala/tools/nsc/util/HashSet.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.util +package scala.tools.nsc +package util class HashSet[T >: Null <: AnyRef](initialCapacity: Int) extends Set[T] { diff --git a/src/compiler/scala/tools/nsc/util/JavaCharArrayReader.scala b/src/compiler/scala/tools/nsc/util/JavaCharArrayReader.scala index 175fda193a..6876d74b81 100755 --- a/src/compiler/scala/tools/nsc/util/JavaCharArrayReader.scala +++ b/src/compiler/scala/tools/nsc/util/JavaCharArrayReader.scala @@ -4,7 +4,8 @@ */ // $Id: CharArrayReader.scala 17610 2009-04-30 22:38:36Z extempore $ -package scala.tools.nsc.util +package scala.tools.nsc +package util import scala.tools.nsc.util.SourceFile.{LF, FF, CR, SU} diff --git a/src/compiler/scala/tools/nsc/util/Position.scala b/src/compiler/scala/tools/nsc/util/Position.scala index 2acf8d1f7a..71de35d29e 100644 --- a/src/compiler/scala/tools/nsc/util/Position.scala +++ b/src/compiler/scala/tools/nsc/util/Position.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.util +package scala.tools.nsc +package util object Position { // a static field diff --git a/src/compiler/scala/tools/nsc/util/RegexCache.scala b/src/compiler/scala/tools/nsc/util/RegexCache.scala index 9ec644726e..c3db44d623 100644 --- a/src/compiler/scala/tools/nsc/util/RegexCache.scala +++ b/src/compiler/scala/tools/nsc/util/RegexCache.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.util +package scala.tools.nsc +package util import java.util.regex.Pattern import scala.collection.mutable diff --git a/src/compiler/scala/tools/nsc/util/Set.scala b/src/compiler/scala/tools/nsc/util/Set.scala index 9ceb30d0ac..f30db0b1b6 100644 --- a/src/compiler/scala/tools/nsc/util/Set.scala +++ b/src/compiler/scala/tools/nsc/util/Set.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.util +package scala.tools.nsc +package util /** A common class for lightweight sets. */ diff --git a/src/compiler/scala/tools/nsc/util/ShowPickled.scala b/src/compiler/scala/tools/nsc/util/ShowPickled.scala index 713c5b164d..98ed06a778 100644 --- a/src/compiler/scala/tools/nsc/util/ShowPickled.scala +++ b/src/compiler/scala/tools/nsc/util/ShowPickled.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.util +package scala.tools.nsc +package util import java.io.{File, FileInputStream, PrintStream, IOException} import java.lang.Long.toHexString diff --git a/src/compiler/scala/tools/nsc/util/SourceFile.scala b/src/compiler/scala/tools/nsc/util/SourceFile.scala index 483f533d32..3744262be6 100644 --- a/src/compiler/scala/tools/nsc/util/SourceFile.scala +++ b/src/compiler/scala/tools/nsc/util/SourceFile.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.nsc.util +package scala.tools.nsc +package util import scala.tools.nsc.io.{AbstractFile, VirtualFile} import scala.collection.mutable.ArrayBuffer import annotation.tailrec diff --git a/src/compiler/scala/tools/nsc/util/Statistics.scala b/src/compiler/scala/tools/nsc/util/Statistics.scala index 10a344911c..6864eb2335 100644 --- a/src/compiler/scala/tools/nsc/util/Statistics.scala +++ b/src/compiler/scala/tools/nsc/util/Statistics.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.nsc.util +package scala.tools.nsc +package util object Statistics { var enabled = false diff --git a/src/compiler/scala/tools/nsc/util/TreeSet.scala b/src/compiler/scala/tools/nsc/util/TreeSet.scala index 5adaeb589a..4f9e9f0a2d 100644 --- a/src/compiler/scala/tools/nsc/util/TreeSet.scala +++ b/src/compiler/scala/tools/nsc/util/TreeSet.scala @@ -4,7 +4,8 @@ */ // $Id$ -package scala.tools.nsc.util +package scala.tools.nsc +package util /** Sets implemented as binary trees. * diff --git a/src/compiler/scala/tools/nsc/util/WorkScheduler.scala b/src/compiler/scala/tools/nsc/util/WorkScheduler.scala index eced845136..94c7c0e3cc 100644 --- a/src/compiler/scala/tools/nsc/util/WorkScheduler.scala +++ b/src/compiler/scala/tools/nsc/util/WorkScheduler.scala @@ -1,4 +1,5 @@ -package scala.tools.nsc.util +package scala.tools.nsc +package util import scala.collection.mutable.Queue diff --git a/src/compiler/scala/tools/nsc/util/trace.scala b/src/compiler/scala/tools/nsc/util/trace.scala index dc78756ec6..97b3123372 100644 --- a/src/compiler/scala/tools/nsc/util/trace.scala +++ b/src/compiler/scala/tools/nsc/util/trace.scala @@ -1,4 +1,5 @@ -package scala.tools.nsc.util +package scala.tools.nsc +package util object trace { def apply[T](msg: String)(value: T): T = { diff --git a/src/dbc/scala/dbc/datatype/ApproximateNumeric.scala b/src/dbc/scala/dbc/datatype/ApproximateNumeric.scala index 2308711cec..8ff60f49eb 100644 --- a/src/dbc/scala/dbc/datatype/ApproximateNumeric.scala +++ b/src/dbc/scala/dbc/datatype/ApproximateNumeric.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.dbc.datatype; +package scala.dbc +package datatype; /** A type category for all SQL types that store varying-precision diff --git a/src/dbc/scala/dbc/datatype/Boolean.scala b/src/dbc/scala/dbc/datatype/Boolean.scala index ef180c2d4c..16e7d7a648 100644 --- a/src/dbc/scala/dbc/datatype/Boolean.scala +++ b/src/dbc/scala/dbc/datatype/Boolean.scala @@ -9,7 +9,8 @@ // $Id:Boolean.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.datatype; +package scala.dbc +package datatype; /** The SQL type for a truth value. */ diff --git a/src/dbc/scala/dbc/datatype/Character.scala b/src/dbc/scala/dbc/datatype/Character.scala index 17144253a0..a4e99860d5 100644 --- a/src/dbc/scala/dbc/datatype/Character.scala +++ b/src/dbc/scala/dbc/datatype/Character.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.dbc.datatype; +package scala.dbc +package datatype; /** A SQL type for a string of characters of arbitrary length with diff --git a/src/dbc/scala/dbc/datatype/CharacterLargeObject.scala b/src/dbc/scala/dbc/datatype/CharacterLargeObject.scala index d13c8bb61d..f2ae2ddd3c 100644 --- a/src/dbc/scala/dbc/datatype/CharacterLargeObject.scala +++ b/src/dbc/scala/dbc/datatype/CharacterLargeObject.scala @@ -9,7 +9,8 @@ // $Id:CharacterLargeObject.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.datatype; +package scala.dbc +package datatype; /** A SQL type for an unbounded length string of characters with arbitrary diff --git a/src/dbc/scala/dbc/datatype/CharacterString.scala b/src/dbc/scala/dbc/datatype/CharacterString.scala index 662e13dc9e..1be95f7029 100644 --- a/src/dbc/scala/dbc/datatype/CharacterString.scala +++ b/src/dbc/scala/dbc/datatype/CharacterString.scala @@ -9,7 +9,8 @@ // $Id:CharacterString.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.datatype; +package scala.dbc +package datatype; /** A type category for all SQL types that store strings of characters. */ diff --git a/src/dbc/scala/dbc/datatype/CharacterVarying.scala b/src/dbc/scala/dbc/datatype/CharacterVarying.scala index adb092dbf3..52649b5e69 100644 --- a/src/dbc/scala/dbc/datatype/CharacterVarying.scala +++ b/src/dbc/scala/dbc/datatype/CharacterVarying.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.dbc.datatype; +package scala.dbc +package datatype; /** A SQL type for a varying length string of characters with arbitrary diff --git a/src/dbc/scala/dbc/datatype/ExactNumeric.scala b/src/dbc/scala/dbc/datatype/ExactNumeric.scala index 4461a9955e..9cb739b736 100644 --- a/src/dbc/scala/dbc/datatype/ExactNumeric.scala +++ b/src/dbc/scala/dbc/datatype/ExactNumeric.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.dbc.datatype; +package scala.dbc +package datatype; /** A type category for all SQL types that store constant-precision diff --git a/src/dbc/scala/dbc/datatype/Factory.scala b/src/dbc/scala/dbc/datatype/Factory.scala index 1a97e33252..c53a120a96 100644 --- a/src/dbc/scala/dbc/datatype/Factory.scala +++ b/src/dbc/scala/dbc/datatype/Factory.scala @@ -9,7 +9,8 @@ // $Id:Factory.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.datatype; +package scala.dbc +package datatype; import java.sql.Types._; diff --git a/src/dbc/scala/dbc/datatype/Numeric.scala b/src/dbc/scala/dbc/datatype/Numeric.scala index 1ba21ce264..597b01d348 100644 --- a/src/dbc/scala/dbc/datatype/Numeric.scala +++ b/src/dbc/scala/dbc/datatype/Numeric.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.dbc.datatype; +package scala.dbc +package datatype; /** A type category for all SQL types that store numbers. */ diff --git a/src/dbc/scala/dbc/datatype/String.scala b/src/dbc/scala/dbc/datatype/String.scala index 44871256c0..a3eb944a3c 100644 --- a/src/dbc/scala/dbc/datatype/String.scala +++ b/src/dbc/scala/dbc/datatype/String.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.dbc.datatype; +package scala.dbc +package datatype; /** A type category for all SQL types that store strings of elements. diff --git a/src/dbc/scala/dbc/datatype/Unknown.scala b/src/dbc/scala/dbc/datatype/Unknown.scala index 9eacbd94e2..3dda39e111 100644 --- a/src/dbc/scala/dbc/datatype/Unknown.scala +++ b/src/dbc/scala/dbc/datatype/Unknown.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.dbc.datatype; +package scala.dbc +package datatype; /** The SQL type for a truth value. */ diff --git a/src/dbc/scala/dbc/exception/IncompatibleSchema.scala b/src/dbc/scala/dbc/exception/IncompatibleSchema.scala index 02f4990256..1897559fcc 100644 --- a/src/dbc/scala/dbc/exception/IncompatibleSchema.scala +++ b/src/dbc/scala/dbc/exception/IncompatibleSchema.scala @@ -9,7 +9,8 @@ // $Id:IncompatibleSchema.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.exception; +package scala.dbc +package exception /** A type category for all SQL types that store constant-precision numbers. */ diff --git a/src/dbc/scala/dbc/exception/UnsupportedFeature.scala b/src/dbc/scala/dbc/exception/UnsupportedFeature.scala index 7540d9d668..19c5190704 100644 --- a/src/dbc/scala/dbc/exception/UnsupportedFeature.scala +++ b/src/dbc/scala/dbc/exception/UnsupportedFeature.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.dbc.exception; +package scala.dbc +package exception /** A type category for all SQL types that store constant-precision numbers. */ diff --git a/src/dbc/scala/dbc/result/Field.scala b/src/dbc/scala/dbc/result/Field.scala index 0a2c794f22..4b1f1ed996 100644 --- a/src/dbc/scala/dbc/result/Field.scala +++ b/src/dbc/scala/dbc/result/Field.scala @@ -9,7 +9,8 @@ // $Id:Field.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.result +package scala.dbc +package result import scala.dbc.datatype._ diff --git a/src/dbc/scala/dbc/result/FieldMetadata.scala b/src/dbc/scala/dbc/result/FieldMetadata.scala index a461e168cf..659bb7c313 100644 --- a/src/dbc/scala/dbc/result/FieldMetadata.scala +++ b/src/dbc/scala/dbc/result/FieldMetadata.scala @@ -9,7 +9,8 @@ // $Id:FieldMetadata.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.result +package scala.dbc +package result /** The class <code>FieldMetadata</cocde> provides informations attached to diff --git a/src/dbc/scala/dbc/result/Relation.scala b/src/dbc/scala/dbc/result/Relation.scala index 1e6411bdeb..0f697503f8 100644 --- a/src/dbc/scala/dbc/result/Relation.scala +++ b/src/dbc/scala/dbc/result/Relation.scala @@ -9,7 +9,8 @@ // $Id:Relation.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.result +package scala.dbc +package result /** An ISO-9075:2003 (SQL) table. This is equivalent to a relation in the diff --git a/src/dbc/scala/dbc/result/Status.scala b/src/dbc/scala/dbc/result/Status.scala index 3f57249526..fcb76e397a 100644 --- a/src/dbc/scala/dbc/result/Status.scala +++ b/src/dbc/scala/dbc/result/Status.scala @@ -9,7 +9,8 @@ // $Id:Status.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.result; +package scala.dbc +package result; import scala.dbc.datatype._; diff --git a/src/dbc/scala/dbc/result/Tuple.scala b/src/dbc/scala/dbc/result/Tuple.scala index 1b469c4c77..ef61bda9e2 100644 --- a/src/dbc/scala/dbc/result/Tuple.scala +++ b/src/dbc/scala/dbc/result/Tuple.scala @@ -9,7 +9,8 @@ // $Id:Tuple.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.result; +package scala.dbc +package result; /** An ISO-9075:2003 (SQL) table row. This is equivalent to a tuple in the relational model. */ diff --git a/src/dbc/scala/dbc/statement/AccessMode.scala b/src/dbc/scala/dbc/statement/AccessMode.scala index 631515020a..983813d700 100644 --- a/src/dbc/scala/dbc/statement/AccessMode.scala +++ b/src/dbc/scala/dbc/statement/AccessMode.scala @@ -9,7 +9,8 @@ // $Id:AccessMode.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.statement +package scala.dbc +package statement abstract class AccessMode { diff --git a/src/dbc/scala/dbc/statement/DerivedColumn.scala b/src/dbc/scala/dbc/statement/DerivedColumn.scala index c6f5c141e9..186f9b0390 100644 --- a/src/dbc/scala/dbc/statement/DerivedColumn.scala +++ b/src/dbc/scala/dbc/statement/DerivedColumn.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.dbc.statement +package scala.dbc +package statement abstract class DerivedColumn { diff --git a/src/dbc/scala/dbc/statement/Expression.scala b/src/dbc/scala/dbc/statement/Expression.scala index 29220f05a3..21f20c831c 100644 --- a/src/dbc/scala/dbc/statement/Expression.scala +++ b/src/dbc/scala/dbc/statement/Expression.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.dbc.statement +package scala.dbc +package statement /** An expression that calculates some value from fields. */ diff --git a/src/dbc/scala/dbc/statement/Insert.scala b/src/dbc/scala/dbc/statement/Insert.scala index ef8cd6a5bb..cfe1056006 100644 --- a/src/dbc/scala/dbc/statement/Insert.scala +++ b/src/dbc/scala/dbc/statement/Insert.scala @@ -9,7 +9,8 @@ // $Id:Insert.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.statement +package scala.dbc +package statement import scala.dbc.statement.expression._ diff --git a/src/dbc/scala/dbc/statement/InsertionData.scala b/src/dbc/scala/dbc/statement/InsertionData.scala index 5755b31c4c..8ae298108f 100644 --- a/src/dbc/scala/dbc/statement/InsertionData.scala +++ b/src/dbc/scala/dbc/statement/InsertionData.scala @@ -9,7 +9,8 @@ // $Id:InsertionData.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.statement +package scala.dbc +package statement import scala.dbc.statement.expression._ diff --git a/src/dbc/scala/dbc/statement/IsolationLevel.scala b/src/dbc/scala/dbc/statement/IsolationLevel.scala index 40b1a5d59a..69d684e0ce 100644 --- a/src/dbc/scala/dbc/statement/IsolationLevel.scala +++ b/src/dbc/scala/dbc/statement/IsolationLevel.scala @@ -9,7 +9,8 @@ // $Id:IsolationLevel.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.statement +package scala.dbc +package statement abstract class IsolationLevel { diff --git a/src/dbc/scala/dbc/statement/JoinType.scala b/src/dbc/scala/dbc/statement/JoinType.scala index e5d251bcfe..be62b682ae 100644 --- a/src/dbc/scala/dbc/statement/JoinType.scala +++ b/src/dbc/scala/dbc/statement/JoinType.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.dbc.statement +package scala.dbc +package statement /** A join behaviour in a <code>Jointure</code>. */ diff --git a/src/dbc/scala/dbc/statement/Jointure.scala b/src/dbc/scala/dbc/statement/Jointure.scala index 7d66f92f51..5f8fca1085 100644 --- a/src/dbc/scala/dbc/statement/Jointure.scala +++ b/src/dbc/scala/dbc/statement/Jointure.scala @@ -9,7 +9,8 @@ // $Id:Jointure.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.statement +package scala.dbc +package statement /** A jointure between two relations. */ diff --git a/src/dbc/scala/dbc/statement/Relation.scala b/src/dbc/scala/dbc/statement/Relation.scala index ecb9f87fef..ce09e59c59 100644 --- a/src/dbc/scala/dbc/statement/Relation.scala +++ b/src/dbc/scala/dbc/statement/Relation.scala @@ -9,7 +9,8 @@ // $Id:Relation.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.statement; +package scala.dbc +package statement; /** A statement that returns a relation. */ diff --git a/src/dbc/scala/dbc/statement/Select.scala b/src/dbc/scala/dbc/statement/Select.scala index b03f9a5d78..ce7b3e8078 100644 --- a/src/dbc/scala/dbc/statement/Select.scala +++ b/src/dbc/scala/dbc/statement/Select.scala @@ -9,7 +9,8 @@ // $Id:Select.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.statement +package scala.dbc +package statement /** A statement that when executed on a database will return a relation. diff --git a/src/dbc/scala/dbc/statement/SetClause.scala b/src/dbc/scala/dbc/statement/SetClause.scala index 16c6656386..dd1b4531d2 100644 --- a/src/dbc/scala/dbc/statement/SetClause.scala +++ b/src/dbc/scala/dbc/statement/SetClause.scala @@ -9,7 +9,8 @@ // $Id:SetClause.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.statement +package scala.dbc +package statement import scala.dbc.statement.expression._ diff --git a/src/dbc/scala/dbc/statement/SetQuantifier.scala b/src/dbc/scala/dbc/statement/SetQuantifier.scala index 4febee6cf8..93d824f758 100644 --- a/src/dbc/scala/dbc/statement/SetQuantifier.scala +++ b/src/dbc/scala/dbc/statement/SetQuantifier.scala @@ -9,7 +9,8 @@ // $Id:SetQuantifier.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.statement +package scala.dbc +package statement /** A set quantifier that defines the collection type of a relation. */ diff --git a/src/dbc/scala/dbc/statement/Statement.scala b/src/dbc/scala/dbc/statement/Statement.scala index e396a0297f..5e67f3c229 100644 --- a/src/dbc/scala/dbc/statement/Statement.scala +++ b/src/dbc/scala/dbc/statement/Statement.scala @@ -9,7 +9,8 @@ // $Id:Statement.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.statement +package scala.dbc +package statement /** An ISO-9075:2003 (SQL) statement. */ diff --git a/src/dbc/scala/dbc/statement/Status.scala b/src/dbc/scala/dbc/statement/Status.scala index d8a8451211..2576f519cd 100644 --- a/src/dbc/scala/dbc/statement/Status.scala +++ b/src/dbc/scala/dbc/statement/Status.scala @@ -9,7 +9,8 @@ // $Id:Status.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.statement +package scala.dbc +package statement import scala.dbc.Database import scala.dbc.result diff --git a/src/dbc/scala/dbc/statement/Table.scala b/src/dbc/scala/dbc/statement/Table.scala index 8a10c4948a..f04a2bf15c 100644 --- a/src/dbc/scala/dbc/statement/Table.scala +++ b/src/dbc/scala/dbc/statement/Table.scala @@ -9,7 +9,8 @@ // $Id:Table.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.statement +package scala.dbc +package statement /** A reference to a table in the database. diff --git a/src/dbc/scala/dbc/statement/Transaction.scala b/src/dbc/scala/dbc/statement/Transaction.scala index 447807da2a..cd0dfec05c 100644 --- a/src/dbc/scala/dbc/statement/Transaction.scala +++ b/src/dbc/scala/dbc/statement/Transaction.scala @@ -9,7 +9,8 @@ // $Id:Transaction.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.statement; +package scala.dbc +package statement; /** A statement that changes the status of the database. */ diff --git a/src/dbc/scala/dbc/statement/Update.scala b/src/dbc/scala/dbc/statement/Update.scala index 3668f994ce..d91d4e4360 100644 --- a/src/dbc/scala/dbc/statement/Update.scala +++ b/src/dbc/scala/dbc/statement/Update.scala @@ -9,7 +9,8 @@ // $Id:Update.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.statement; +package scala.dbc +package statement; import scala.dbc.statement.expression._; diff --git a/src/dbc/scala/dbc/statement/expression/Aggregate.scala b/src/dbc/scala/dbc/statement/expression/Aggregate.scala index a2310b0a10..b9642f0501 100644 --- a/src/dbc/scala/dbc/statement/expression/Aggregate.scala +++ b/src/dbc/scala/dbc/statement/expression/Aggregate.scala @@ -9,7 +9,9 @@ // $Id$ -package scala.dbc.statement.expression; +package scala.dbc +package statement +package expression abstract class Aggregate extends Expression { diff --git a/src/dbc/scala/dbc/statement/expression/BinaryOperator.scala b/src/dbc/scala/dbc/statement/expression/BinaryOperator.scala index 56fefd0635..8f33472296 100644 --- a/src/dbc/scala/dbc/statement/expression/BinaryOperator.scala +++ b/src/dbc/scala/dbc/statement/expression/BinaryOperator.scala @@ -9,7 +9,9 @@ // $Id$ -package scala.dbc.statement.expression; +package scala.dbc +package statement +package expression; abstract class BinaryOperator extends Expression { diff --git a/src/dbc/scala/dbc/statement/expression/Constant.scala b/src/dbc/scala/dbc/statement/expression/Constant.scala index 4528f39c3a..eb806988e5 100644 --- a/src/dbc/scala/dbc/statement/expression/Constant.scala +++ b/src/dbc/scala/dbc/statement/expression/Constant.scala @@ -9,7 +9,9 @@ // $Id:Constant.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.statement.expression; +package scala.dbc +package statement +package expression; abstract class Constant extends Expression { diff --git a/src/dbc/scala/dbc/statement/expression/Default.scala b/src/dbc/scala/dbc/statement/expression/Default.scala index 1c1507fecb..db65cd821d 100644 --- a/src/dbc/scala/dbc/statement/expression/Default.scala +++ b/src/dbc/scala/dbc/statement/expression/Default.scala @@ -9,7 +9,9 @@ // $Id:Default.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.statement.expression; +package scala.dbc +package statement +package expression; case object Default extends Expression { diff --git a/src/dbc/scala/dbc/statement/expression/Field.scala b/src/dbc/scala/dbc/statement/expression/Field.scala index 60ff431dc9..86b35c0b22 100644 --- a/src/dbc/scala/dbc/statement/expression/Field.scala +++ b/src/dbc/scala/dbc/statement/expression/Field.scala @@ -9,7 +9,9 @@ // $Id$ -package scala.dbc.statement.expression; +package scala.dbc +package statement +package expression; abstract class Field extends Expression { diff --git a/src/dbc/scala/dbc/statement/expression/FunctionCall.scala b/src/dbc/scala/dbc/statement/expression/FunctionCall.scala index facfb11046..d1114992a2 100644 --- a/src/dbc/scala/dbc/statement/expression/FunctionCall.scala +++ b/src/dbc/scala/dbc/statement/expression/FunctionCall.scala @@ -9,7 +9,9 @@ // $Id:FunctionCall.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.statement.expression; +package scala.dbc +package statement +package expression; case class FunctionCall ( diff --git a/src/dbc/scala/dbc/statement/expression/Select.scala b/src/dbc/scala/dbc/statement/expression/Select.scala index 44b109fc95..ae69549be3 100644 --- a/src/dbc/scala/dbc/statement/expression/Select.scala +++ b/src/dbc/scala/dbc/statement/expression/Select.scala @@ -9,7 +9,9 @@ // $Id$ -package scala.dbc.statement.expression; +package scala.dbc +package statement +package expression; abstract class Select extends Expression { diff --git a/src/dbc/scala/dbc/statement/expression/SetFunction.scala b/src/dbc/scala/dbc/statement/expression/SetFunction.scala index 424f659dd9..2a17cb690c 100644 --- a/src/dbc/scala/dbc/statement/expression/SetFunction.scala +++ b/src/dbc/scala/dbc/statement/expression/SetFunction.scala @@ -9,7 +9,9 @@ // $Id:SetFunction.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.statement.expression; +package scala.dbc +package statement +package expression; abstract class SetFunction { diff --git a/src/dbc/scala/dbc/statement/expression/TypeCast.scala b/src/dbc/scala/dbc/statement/expression/TypeCast.scala index e8348f396f..4591f268bf 100644 --- a/src/dbc/scala/dbc/statement/expression/TypeCast.scala +++ b/src/dbc/scala/dbc/statement/expression/TypeCast.scala @@ -9,7 +9,9 @@ // $Id:TypeCast.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.statement.expression; +package scala.dbc +package statement +package expression; case class TypeCast ( diff --git a/src/dbc/scala/dbc/statement/expression/UnaryOperator.scala b/src/dbc/scala/dbc/statement/expression/UnaryOperator.scala index 31889a4e67..efe05cee64 100644 --- a/src/dbc/scala/dbc/statement/expression/UnaryOperator.scala +++ b/src/dbc/scala/dbc/statement/expression/UnaryOperator.scala @@ -9,7 +9,9 @@ // $Id$ -package scala.dbc.statement.expression; +package scala.dbc +package statement +package expression; abstract class UnaryOperator extends Expression { diff --git a/src/dbc/scala/dbc/syntax/DataTypeUtil.scala b/src/dbc/scala/dbc/syntax/DataTypeUtil.scala index 94915b66f4..61e312228c 100644 --- a/src/dbc/scala/dbc/syntax/DataTypeUtil.scala +++ b/src/dbc/scala/dbc/syntax/DataTypeUtil.scala @@ -9,7 +9,8 @@ // $Id:DataTypeUtil.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.syntax; +package scala.dbc +package syntax; import java.math.BigDecimal; diff --git a/src/dbc/scala/dbc/syntax/Database.scala b/src/dbc/scala/dbc/syntax/Database.scala index bc4c1efdfa..04ac703c84 100644 --- a/src/dbc/scala/dbc/syntax/Database.scala +++ b/src/dbc/scala/dbc/syntax/Database.scala @@ -9,7 +9,8 @@ // $Id:Database.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.syntax; +package scala.dbc +package syntax; import java.net.URI; diff --git a/src/dbc/scala/dbc/syntax/Statement.scala b/src/dbc/scala/dbc/syntax/Statement.scala index eb8c999e14..627466dd8e 100644 --- a/src/dbc/scala/dbc/syntax/Statement.scala +++ b/src/dbc/scala/dbc/syntax/Statement.scala @@ -9,7 +9,8 @@ // $Id:Statement.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.syntax; +package scala.dbc +package syntax; import java.math.BigDecimal; diff --git a/src/dbc/scala/dbc/syntax/StatementExpression.scala b/src/dbc/scala/dbc/syntax/StatementExpression.scala index 9c72a144bc..82af64c0ce 100644 --- a/src/dbc/scala/dbc/syntax/StatementExpression.scala +++ b/src/dbc/scala/dbc/syntax/StatementExpression.scala @@ -9,7 +9,8 @@ // $Id:StatementExpression.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.syntax; +package scala.dbc +package syntax; import java.math.BigDecimal; diff --git a/src/dbc/scala/dbc/value/ApproximateNumeric.scala b/src/dbc/scala/dbc/value/ApproximateNumeric.scala index 915511ac15..f5969ad9fb 100644 --- a/src/dbc/scala/dbc/value/ApproximateNumeric.scala +++ b/src/dbc/scala/dbc/value/ApproximateNumeric.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.dbc.value; +package scala.dbc +package value; abstract class ApproximateNumeric [Type] extends Value { diff --git a/src/dbc/scala/dbc/value/Boolean.scala b/src/dbc/scala/dbc/value/Boolean.scala index 8e6fbe0238..9b52b27e98 100644 --- a/src/dbc/scala/dbc/value/Boolean.scala +++ b/src/dbc/scala/dbc/value/Boolean.scala @@ -9,7 +9,8 @@ // $Id:Boolean.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.value; +package scala.dbc +package value; abstract class Boolean extends Value { diff --git a/src/dbc/scala/dbc/value/Character.scala b/src/dbc/scala/dbc/value/Character.scala index ec22039015..91589946d0 100644 --- a/src/dbc/scala/dbc/value/Character.scala +++ b/src/dbc/scala/dbc/value/Character.scala @@ -9,7 +9,8 @@ // $Id:Character.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.value; +package scala.dbc +package value; /** A SQL-99 value of type character string. */ diff --git a/src/dbc/scala/dbc/value/CharacterLargeObject.scala b/src/dbc/scala/dbc/value/CharacterLargeObject.scala index 45e4af7c14..61c83ec9ce 100644 --- a/src/dbc/scala/dbc/value/CharacterLargeObject.scala +++ b/src/dbc/scala/dbc/value/CharacterLargeObject.scala @@ -9,7 +9,8 @@ // $Id:CharacterLargeObject.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.value; +package scala.dbc +package value; /** A SQL-99 value of type character large object. */ diff --git a/src/dbc/scala/dbc/value/CharacterVarying.scala b/src/dbc/scala/dbc/value/CharacterVarying.scala index 086ae0c086..6cf78ae199 100644 --- a/src/dbc/scala/dbc/value/CharacterVarying.scala +++ b/src/dbc/scala/dbc/value/CharacterVarying.scala @@ -9,7 +9,8 @@ // $Id:CharacterVarying.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.value; +package scala.dbc +package value; /** A SQL-99 value of type character varying string. */ diff --git a/src/dbc/scala/dbc/value/Conversion.scala b/src/dbc/scala/dbc/value/Conversion.scala index dd2b0c3748..4f0adff7c6 100644 --- a/src/dbc/scala/dbc/value/Conversion.scala +++ b/src/dbc/scala/dbc/value/Conversion.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.dbc.value; +package scala.dbc +package value; import java.math._; diff --git a/src/dbc/scala/dbc/value/ExactNumeric.scala b/src/dbc/scala/dbc/value/ExactNumeric.scala index f8d8ace7ed..0d6fcf8911 100644 --- a/src/dbc/scala/dbc/value/ExactNumeric.scala +++ b/src/dbc/scala/dbc/value/ExactNumeric.scala @@ -9,7 +9,8 @@ // $Id:ExactNumeric.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.value; +package scala.dbc +package value; import java.math.BigInteger; diff --git a/src/dbc/scala/dbc/value/Factory.scala b/src/dbc/scala/dbc/value/Factory.scala index 3ea1657e72..8e49db917b 100644 --- a/src/dbc/scala/dbc/value/Factory.scala +++ b/src/dbc/scala/dbc/value/Factory.scala @@ -9,7 +9,8 @@ // $Id:Factory.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.value; +package scala.dbc +package value; import java.math.BigInteger; diff --git a/src/dbc/scala/dbc/value/Unknown.scala b/src/dbc/scala/dbc/value/Unknown.scala index c50cb27eb8..6239ad8e3b 100644 --- a/src/dbc/scala/dbc/value/Unknown.scala +++ b/src/dbc/scala/dbc/value/Unknown.scala @@ -9,7 +9,8 @@ // $Id:Unknown.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.value; +package scala.dbc +package value; abstract class Unknown extends Value { diff --git a/src/dbc/scala/dbc/vendor/PostgreSQL.scala b/src/dbc/scala/dbc/vendor/PostgreSQL.scala index f4305fba62..60a47bf5ae 100644 --- a/src/dbc/scala/dbc/vendor/PostgreSQL.scala +++ b/src/dbc/scala/dbc/vendor/PostgreSQL.scala @@ -9,7 +9,8 @@ // $Id:PostgreSQL.scala 6853 2006-03-20 16:58:47 +0100 (Mon, 20 Mar 2006) dubochet $ -package scala.dbc.vendor; +package scala.dbc +package vendor; import compat.Platform diff --git a/src/library/scala/collection/Iterable.scala b/src/library/scala/collection/Iterable.scala index c3a3082e8a..3d94c9c0fb 100644 --- a/src/library/scala/collection/Iterable.scala +++ b/src/library/scala/collection/Iterable.scala @@ -10,7 +10,7 @@ package scala.collection -import util.control.Breaks._ +import scala.util.control.Breaks._ // import immutable.Stream import generic._ diff --git a/src/library/scala/collection/LinearSequence.scala b/src/library/scala/collection/LinearSequence.scala index 0d926fd36f..fa7977d7eb 100644 --- a/src/library/scala/collection/LinearSequence.scala +++ b/src/library/scala/collection/LinearSequence.scala @@ -14,7 +14,7 @@ package scala.collection import mutable.ListBuffer // import immutable.{List, Nil, ::} import generic._ -import util.control.Breaks._ +import scala.util.control.Breaks._ /** <p> * Class <code>Linear[A]</code> represents linear sequences of elements. diff --git a/src/library/scala/collection/Sequence.scala b/src/library/scala/collection/Sequence.scala index 04411c8db3..b0c507f088 100644 --- a/src/library/scala/collection/Sequence.scala +++ b/src/library/scala/collection/Sequence.scala @@ -14,7 +14,7 @@ package scala.collection import mutable.ListBuffer // import immutable.{List, Nil, ::} import generic._ -import util.control.Breaks._ +import scala.util.control.Breaks._ /** Class <code>Sequence[A]</code> represents sequences of elements * of type <code>A</code>. diff --git a/src/library/scala/collection/Traversable.scala b/src/library/scala/collection/Traversable.scala index 1ae0c3b029..9998e02242 100644 --- a/src/library/scala/collection/Traversable.scala +++ b/src/library/scala/collection/Traversable.scala @@ -11,7 +11,7 @@ package scala.collection // import immutable.{List, Stream, Nil} import mutable.{Buffer, ArrayBuffer, ListBuffer} -import util.control.Breaks +import scala.util.control.Breaks import generic._ /** <p> diff --git a/src/library/scala/collection/generic/Addable.scala b/src/library/scala/collection/generic/Addable.scala index 5a794d4cde..d1348ee2ff 100644 --- a/src/library/scala/collection/generic/Addable.scala +++ b/src/library/scala/collection/generic/Addable.scala @@ -9,6 +9,7 @@ // $Id$ package scala.collection.generic +import scala.collection._ /** This class represents collections that can be added to other * collections using a '+' operator. diff --git a/src/library/scala/collection/generic/AddingBuilder.scala b/src/library/scala/collection/generic/AddingBuilder.scala index 7963836922..fbb195646a 100644 --- a/src/library/scala/collection/generic/AddingBuilder.scala +++ b/src/library/scala/collection/generic/AddingBuilder.scala @@ -9,6 +9,7 @@ // $Id$ package scala.collection.generic +import scala.collection._ // import collection.immutable.{List, Nil, ::} diff --git a/src/library/scala/collection/generic/BitSetFactory.scala b/src/library/scala/collection/generic/BitSetFactory.scala index acbfc0fd0b..035347340f 100644 --- a/src/library/scala/collection/generic/BitSetFactory.scala +++ b/src/library/scala/collection/generic/BitSetFactory.scala @@ -7,6 +7,7 @@ \* */ // $Id$ package scala.collection.generic +import scala.collection._ trait BitSetFactory[Coll <: BitSet with BitSetTemplate[Coll]] { def newBuilder: Builder[Int, Coll] = new AddingBuilder[Int, Coll](empty) diff --git a/src/library/scala/collection/generic/BitSetTemplate.scala b/src/library/scala/collection/generic/BitSetTemplate.scala index 66c8b27972..501a388b4d 100644 --- a/src/library/scala/collection/generic/BitSetTemplate.scala +++ b/src/library/scala/collection/generic/BitSetTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import BitSetTemplate._ import generic._ diff --git a/src/library/scala/collection/generic/BufferTemplate.scala b/src/library/scala/collection/generic/BufferTemplate.scala index ca14d586e6..55f9322949 100644 --- a/src/library/scala/collection/generic/BufferTemplate.scala +++ b/src/library/scala/collection/generic/BufferTemplate.scala @@ -11,8 +11,9 @@ package scala.collection.generic -import mutable.Buffer -import script._ +import scala.collection._ +import scala.collection.mutable.Buffer +import scala.collection.script._ /** Buffers are used to create sequences of elements incrementally by * appending, prepending, or inserting new elements. It is also diff --git a/src/library/scala/collection/generic/Builder.scala b/src/library/scala/collection/generic/Builder.scala index 974018ce26..3d0489223c 100644 --- a/src/library/scala/collection/generic/Builder.scala +++ b/src/library/scala/collection/generic/Builder.scala @@ -9,6 +9,7 @@ // $Id$ package scala.collection.generic +import scala.collection._ /** The base trait of all builders. * A builder lets one construct a collection incrementally, by adding diff --git a/src/library/scala/collection/generic/BuilderFactory.scala b/src/library/scala/collection/generic/BuilderFactory.scala index 2834b38951..1940865031 100644 --- a/src/library/scala/collection/generic/BuilderFactory.scala +++ b/src/library/scala/collection/generic/BuilderFactory.scala @@ -9,6 +9,7 @@ // $Id$ package scala.collection.generic +import scala.collection._ /** A base class for builder factories */ diff --git a/src/library/scala/collection/generic/Cloneable.scala b/src/library/scala/collection/generic/Cloneable.scala index 9b84df0e2b..667a7af588 100644 --- a/src/library/scala/collection/generic/Cloneable.scala +++ b/src/library/scala/collection/generic/Cloneable.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ /** A trait for cloneable collections. */ diff --git a/src/library/scala/collection/generic/Companion.scala b/src/library/scala/collection/generic/Companion.scala index 3ab7a4fa06..fd2e9325ca 100644 --- a/src/library/scala/collection/generic/Companion.scala +++ b/src/library/scala/collection/generic/Companion.scala @@ -10,6 +10,9 @@ package scala.collection.generic +import scala.collection._ + +import scala.collection._ abstract class Companion[+CC[X] <: Traversable[X]] { type Coll = CC[_] diff --git a/src/library/scala/collection/generic/DoubleLinkedListTemplate.scala b/src/library/scala/collection/generic/DoubleLinkedListTemplate.scala index 14686cdb90..6bad44054d 100644 --- a/src/library/scala/collection/generic/DoubleLinkedListTemplate.scala +++ b/src/library/scala/collection/generic/DoubleLinkedListTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ /** This extensible class may be used as a basis for implementing double * linked lists. Type variable <code>A</code> refers to the element type diff --git a/src/library/scala/collection/generic/Growable.scala b/src/library/scala/collection/generic/Growable.scala index bbef2b7f29..7004952040 100644 --- a/src/library/scala/collection/generic/Growable.scala +++ b/src/library/scala/collection/generic/Growable.scala @@ -9,6 +9,7 @@ // $Id$ package scala.collection.generic +import scala.collection._ /** This class represents collections that can be augmented using a `+=` operator * and that can be cleared of all elements using the `clear` method. diff --git a/src/library/scala/collection/generic/ImmutableMapFactory.scala b/src/library/scala/collection/generic/ImmutableMapFactory.scala index f401f86603..d74048f059 100644 --- a/src/library/scala/collection/generic/ImmutableMapFactory.scala +++ b/src/library/scala/collection/generic/ImmutableMapFactory.scala @@ -9,6 +9,7 @@ // $Id$ package scala.collection.generic +import scala.collection._ /** A template for companion objects of <code>immutable.Map</code> and * subclasses thereof. diff --git a/src/library/scala/collection/generic/ImmutableMapTemplate.scala b/src/library/scala/collection/generic/ImmutableMapTemplate.scala index 5fbf3fda21..c754de541f 100644 --- a/src/library/scala/collection/generic/ImmutableMapTemplate.scala +++ b/src/library/scala/collection/generic/ImmutableMapTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ /** <p> * A generic template for immutable maps from keys of type <code>A</code> diff --git a/src/library/scala/collection/generic/ImmutableSortedMapFactory.scala b/src/library/scala/collection/generic/ImmutableSortedMapFactory.scala index 1e36149f83..447129aab5 100644 --- a/src/library/scala/collection/generic/ImmutableSortedMapFactory.scala +++ b/src/library/scala/collection/generic/ImmutableSortedMapFactory.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ /** A template for companion objects of immutable.Map and subclasses thereof. */ diff --git a/src/library/scala/collection/generic/ImmutableSortedSetFactory.scala b/src/library/scala/collection/generic/ImmutableSortedSetFactory.scala index 9d09e35132..141f3aee6f 100644 --- a/src/library/scala/collection/generic/ImmutableSortedSetFactory.scala +++ b/src/library/scala/collection/generic/ImmutableSortedSetFactory.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ /** A template for companion objects of mutable.Map and subclasses thereof. */ diff --git a/src/library/scala/collection/generic/IterableForwarder.scala b/src/library/scala/collection/generic/IterableForwarder.scala index 9fefd22367..9965a2bf2c 100644 --- a/src/library/scala/collection/generic/IterableForwarder.scala +++ b/src/library/scala/collection/generic/IterableForwarder.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import collection.mutable.Buffer diff --git a/src/library/scala/collection/generic/IterableProxyTemplate.scala b/src/library/scala/collection/generic/IterableProxyTemplate.scala index 74911ec113..545294e341 100644 --- a/src/library/scala/collection/generic/IterableProxyTemplate.scala +++ b/src/library/scala/collection/generic/IterableProxyTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import collection.mutable.Buffer diff --git a/src/library/scala/collection/generic/IterableTemplate.scala b/src/library/scala/collection/generic/IterableTemplate.scala index b0555df124..3477634821 100644 --- a/src/library/scala/collection/generic/IterableTemplate.scala +++ b/src/library/scala/collection/generic/IterableTemplate.scala @@ -9,6 +9,7 @@ // $Id$ package scala.collection.generic +import scala.collection._ import util.control.Breaks._ // import immutable.Stream // !!! diff --git a/src/library/scala/collection/generic/IterableView.scala b/src/library/scala/collection/generic/IterableView.scala index f63eb4930b..eca431ae1e 100644 --- a/src/library/scala/collection/generic/IterableView.scala +++ b/src/library/scala/collection/generic/IterableView.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import TraversableView.NoBuilder diff --git a/src/library/scala/collection/generic/IterableViewTemplate.scala b/src/library/scala/collection/generic/IterableViewTemplate.scala index 674ad9c30c..eda3f191f0 100644 --- a/src/library/scala/collection/generic/IterableViewTemplate.scala +++ b/src/library/scala/collection/generic/IterableViewTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import TraversableView.NoBuilder diff --git a/src/library/scala/collection/generic/LazyBuilder.scala b/src/library/scala/collection/generic/LazyBuilder.scala index 8210225198..3f444bc02e 100644 --- a/src/library/scala/collection/generic/LazyBuilder.scala +++ b/src/library/scala/collection/generic/LazyBuilder.scala @@ -9,6 +9,7 @@ // $Id$ package scala.collection.generic +import scala.collection._ // import immutable.{List, Nil, ::} import mutable.ListBuffer diff --git a/src/library/scala/collection/generic/LinearSequenceTemplate.scala b/src/library/scala/collection/generic/LinearSequenceTemplate.scala index 5a66f4cfa5..6dcf96fce4 100644 --- a/src/library/scala/collection/generic/LinearSequenceTemplate.scala +++ b/src/library/scala/collection/generic/LinearSequenceTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import mutable.ListBuffer // import immutable.{List, Nil, ::} diff --git a/src/library/scala/collection/generic/LinkedListTemplate.scala b/src/library/scala/collection/generic/LinkedListTemplate.scala index 62f33eeccb..a368f36b64 100644 --- a/src/library/scala/collection/generic/LinkedListTemplate.scala +++ b/src/library/scala/collection/generic/LinkedListTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ /** This extensible class may be used as a basis for implementing linked * list. Type variable <code>A</code> refers to the element type of the diff --git a/src/library/scala/collection/generic/MapBuilder.scala b/src/library/scala/collection/generic/MapBuilder.scala index 9d2249fc21..90c667a50a 100644 --- a/src/library/scala/collection/generic/MapBuilder.scala +++ b/src/library/scala/collection/generic/MapBuilder.scala @@ -9,6 +9,7 @@ // $Id$ package scala.collection.generic +import scala.collection._ // import collection.immutable.{List, Nil, ::} diff --git a/src/library/scala/collection/generic/MapFactory.scala b/src/library/scala/collection/generic/MapFactory.scala index 32916933ac..6caa97b270 100644 --- a/src/library/scala/collection/generic/MapFactory.scala +++ b/src/library/scala/collection/generic/MapFactory.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ /** A template for companion objects of <code>mutable.Map</code> and * subclasses thereof. diff --git a/src/library/scala/collection/generic/MapProxyTemplate.scala b/src/library/scala/collection/generic/MapProxyTemplate.scala index ae53e33eaf..6ab3e470ab 100644 --- a/src/library/scala/collection/generic/MapProxyTemplate.scala +++ b/src/library/scala/collection/generic/MapProxyTemplate.scala @@ -7,6 +7,7 @@ \* */ package scala.collection.generic +import scala.collection._ // Methods could be printed by cat MapTemplate.scala | egrep '^ (override )?def' diff --git a/src/library/scala/collection/generic/MapTemplate.scala b/src/library/scala/collection/generic/MapTemplate.scala index 651eb2bd81..5ad959ae60 100644 --- a/src/library/scala/collection/generic/MapTemplate.scala +++ b/src/library/scala/collection/generic/MapTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ /** <p> * A generic template for maps from keys of type <code>A</code> to values diff --git a/src/library/scala/collection/generic/MutableMapFactory.scala b/src/library/scala/collection/generic/MutableMapFactory.scala index c3ef54efcb..0d72339c2c 100644 --- a/src/library/scala/collection/generic/MutableMapFactory.scala +++ b/src/library/scala/collection/generic/MutableMapFactory.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ /** A template for companion objects of mutable.Map and subclasses thereof. */ diff --git a/src/library/scala/collection/generic/MutableMapTemplate.scala b/src/library/scala/collection/generic/MutableMapTemplate.scala index 334fa937a4..5614a885b7 100644 --- a/src/library/scala/collection/generic/MutableMapTemplate.scala +++ b/src/library/scala/collection/generic/MutableMapTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ /** <p> * A generic template for mutable maps from keys of type <code>A</code> to diff --git a/src/library/scala/collection/generic/MutableMapTemplateBase.scala b/src/library/scala/collection/generic/MutableMapTemplateBase.scala index 5486372f28..e55a04e1a1 100755 --- a/src/library/scala/collection/generic/MutableMapTemplateBase.scala +++ b/src/library/scala/collection/generic/MutableMapTemplateBase.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ /** The reason for this class is so that we can * have both a generic immutable `+` with signature diff --git a/src/library/scala/collection/generic/MutableSetTemplate.scala b/src/library/scala/collection/generic/MutableSetTemplate.scala index 7ed515a4d6..1f29838174 100644 --- a/src/library/scala/collection/generic/MutableSetTemplate.scala +++ b/src/library/scala/collection/generic/MutableSetTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import script._ diff --git a/src/library/scala/collection/generic/MutableVectorTemplate.scala b/src/library/scala/collection/generic/MutableVectorTemplate.scala index 2067fb99c2..4cb3856464 100644 --- a/src/library/scala/collection/generic/MutableVectorTemplate.scala +++ b/src/library/scala/collection/generic/MutableVectorTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ /** A subtrait of collection.Vector which represents sequences * that can be mutated. diff --git a/src/library/scala/collection/generic/MutableVectorView.scala b/src/library/scala/collection/generic/MutableVectorView.scala index 3d8fab6dec..1a84ace1e2 100644 --- a/src/library/scala/collection/generic/MutableVectorView.scala +++ b/src/library/scala/collection/generic/MutableVectorView.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import TraversableView.NoBuilder diff --git a/src/library/scala/collection/generic/MutableVectorViewTemplate.scala b/src/library/scala/collection/generic/MutableVectorViewTemplate.scala index 15bee72db3..61531ed96b 100644 --- a/src/library/scala/collection/generic/MutableVectorViewTemplate.scala +++ b/src/library/scala/collection/generic/MutableVectorViewTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import TraversableView.NoBuilder diff --git a/src/library/scala/collection/generic/SequenceFactory.scala b/src/library/scala/collection/generic/SequenceFactory.scala index 3fcfe870cd..acf0f0cfd1 100644 --- a/src/library/scala/collection/generic/SequenceFactory.scala +++ b/src/library/scala/collection/generic/SequenceFactory.scala @@ -10,6 +10,8 @@ package scala.collection.generic +import scala.collection._ +import scala.collection._ /** A template for companion objects of Sequence and subclasses thereof. */ diff --git a/src/library/scala/collection/generic/SequenceForwarder.scala b/src/library/scala/collection/generic/SequenceForwarder.scala index 40bc212718..e42ce086d5 100644 --- a/src/library/scala/collection/generic/SequenceForwarder.scala +++ b/src/library/scala/collection/generic/SequenceForwarder.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ /** This class implements a forwarder for sequences. It forwards * all calls to a different sequence object except for diff --git a/src/library/scala/collection/generic/SequenceProxyTemplate.scala b/src/library/scala/collection/generic/SequenceProxyTemplate.scala index 4231dc1eb7..d3f5c3c9b5 100644 --- a/src/library/scala/collection/generic/SequenceProxyTemplate.scala +++ b/src/library/scala/collection/generic/SequenceProxyTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import collection.mutable.Buffer diff --git a/src/library/scala/collection/generic/SequenceTemplate.scala b/src/library/scala/collection/generic/SequenceTemplate.scala index f3a9f03f4a..ec08d8a160 100644 --- a/src/library/scala/collection/generic/SequenceTemplate.scala +++ b/src/library/scala/collection/generic/SequenceTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import mutable.{ListBuffer, HashMap} diff --git a/src/library/scala/collection/generic/SequenceView.scala b/src/library/scala/collection/generic/SequenceView.scala index 25b015dd86..269d247316 100644 --- a/src/library/scala/collection/generic/SequenceView.scala +++ b/src/library/scala/collection/generic/SequenceView.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import TraversableView.NoBuilder diff --git a/src/library/scala/collection/generic/SequenceViewTemplate.scala b/src/library/scala/collection/generic/SequenceViewTemplate.scala index 998b61271a..12ccd300e2 100644 --- a/src/library/scala/collection/generic/SequenceViewTemplate.scala +++ b/src/library/scala/collection/generic/SequenceViewTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import Sequence.fill import TraversableView.NoBuilder diff --git a/src/library/scala/collection/generic/SetBuilder.scala b/src/library/scala/collection/generic/SetBuilder.scala index 1c4d3a18d9..df8949e93c 100644 --- a/src/library/scala/collection/generic/SetBuilder.scala +++ b/src/library/scala/collection/generic/SetBuilder.scala @@ -9,6 +9,7 @@ // $Id$ package scala.collection.generic +import scala.collection._ // import collection.immutable.{List, Nil, ::} diff --git a/src/library/scala/collection/generic/SetClass.scala b/src/library/scala/collection/generic/SetClass.scala index 41b4477811..7e03ea2441 100644 --- a/src/library/scala/collection/generic/SetClass.scala +++ b/src/library/scala/collection/generic/SetClass.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ trait SetClass[A, +CC[X] <: Set[X]] extends TraversableClass[A, CC] { def empty: CC[A] = companion.empty[A] diff --git a/src/library/scala/collection/generic/SetFactory.scala b/src/library/scala/collection/generic/SetFactory.scala index 9696a72810..4422f58f57 100644 --- a/src/library/scala/collection/generic/SetFactory.scala +++ b/src/library/scala/collection/generic/SetFactory.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ /** A template for companion objects of <code>Set</code> and subclasses * thereof. diff --git a/src/library/scala/collection/generic/SetProxyTemplate.scala b/src/library/scala/collection/generic/SetProxyTemplate.scala index a944b132a0..057025e5c5 100644 --- a/src/library/scala/collection/generic/SetProxyTemplate.scala +++ b/src/library/scala/collection/generic/SetProxyTemplate.scala @@ -8,6 +8,7 @@ package scala.collection.generic +import scala.collection._ // Methods could be printed by cat SetTemplate.scala | egrep '^ (override )?def' diff --git a/src/library/scala/collection/generic/SetTemplate.scala b/src/library/scala/collection/generic/SetTemplate.scala index f3f8bf3e2c..e7f93e2701 100644 --- a/src/library/scala/collection/generic/SetTemplate.scala +++ b/src/library/scala/collection/generic/SetTemplate.scala @@ -9,6 +9,7 @@ // $Id$ package scala.collection.generic +import scala.collection._ /** <p> * A generic template for sets of type <code>A</code>.<br/> diff --git a/src/library/scala/collection/generic/Shrinkable.scala b/src/library/scala/collection/generic/Shrinkable.scala index 342e724e80..83b164abac 100644 --- a/src/library/scala/collection/generic/Shrinkable.scala +++ b/src/library/scala/collection/generic/Shrinkable.scala @@ -9,6 +9,7 @@ // $Id$ package scala.collection.generic +import scala.collection._ /** This class represents collections that can be reduced using a -= operator. * diff --git a/src/library/scala/collection/generic/Sorted.scala b/src/library/scala/collection/generic/Sorted.scala index fb26919424..43d46dcc26 100644 --- a/src/library/scala/collection/generic/Sorted.scala +++ b/src/library/scala/collection/generic/Sorted.scala @@ -9,6 +9,7 @@ // $Id$ package scala.collection.generic +import scala.collection._ /** Any collection (including maps) whose keys (or elements) are ordered. * diff --git a/src/library/scala/collection/generic/SortedMapFactory.scala b/src/library/scala/collection/generic/SortedMapFactory.scala index 3c1355ac99..4ea81a417c 100644 --- a/src/library/scala/collection/generic/SortedMapFactory.scala +++ b/src/library/scala/collection/generic/SortedMapFactory.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ /** A template for companion objects of mutable.Map and subclasses thereof. */ diff --git a/src/library/scala/collection/generic/SortedMapTemplate.scala b/src/library/scala/collection/generic/SortedMapTemplate.scala index 7dd6fae30e..b6bdd15deb 100644 --- a/src/library/scala/collection/generic/SortedMapTemplate.scala +++ b/src/library/scala/collection/generic/SortedMapTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ /** A template for maps whose keys are sorted. * To create a concrete sorted map, you need to implement the rangeImpl method, diff --git a/src/library/scala/collection/generic/SortedSetFactory.scala b/src/library/scala/collection/generic/SortedSetFactory.scala index b113528653..5f813dec7f 100644 --- a/src/library/scala/collection/generic/SortedSetFactory.scala +++ b/src/library/scala/collection/generic/SortedSetFactory.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ /** A template for companion objects of Set and subclasses thereof. */ diff --git a/src/library/scala/collection/generic/SortedSetTemplate.scala b/src/library/scala/collection/generic/SortedSetTemplate.scala index f7da860e25..2a793daca6 100644 --- a/src/library/scala/collection/generic/SortedSetTemplate.scala +++ b/src/library/scala/collection/generic/SortedSetTemplate.scala @@ -10,6 +10,7 @@ // !!! todo: integrate in new collections library package scala.collection.generic +import scala.collection._ /** A template for sets which are sorted. * diff --git a/src/library/scala/collection/generic/Subtractable.scala b/src/library/scala/collection/generic/Subtractable.scala index 151298fe20..1ac70c7391 100644 --- a/src/library/scala/collection/generic/Subtractable.scala +++ b/src/library/scala/collection/generic/Subtractable.scala @@ -9,6 +9,7 @@ // $Id$ package scala.collection.generic +import scala.collection._ /** This class represents collections that can be reduced using a - operator. * diff --git a/src/library/scala/collection/generic/TraversableClass.scala b/src/library/scala/collection/generic/TraversableClass.scala index 04c61dc413..6d6d445d88 100644 --- a/src/library/scala/collection/generic/TraversableClass.scala +++ b/src/library/scala/collection/generic/TraversableClass.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import annotation.unchecked.uncheckedVariance diff --git a/src/library/scala/collection/generic/TraversableFactory.scala b/src/library/scala/collection/generic/TraversableFactory.scala index 4b783370bd..747dd993bb 100644 --- a/src/library/scala/collection/generic/TraversableFactory.scala +++ b/src/library/scala/collection/generic/TraversableFactory.scala @@ -10,6 +10,9 @@ package scala.collection.generic +import scala.collection._ + +import scala.collection._ /** A template for companion objects of Traversable and subclasses thereof. */ diff --git a/src/library/scala/collection/generic/TraversableForwarder.scala b/src/library/scala/collection/generic/TraversableForwarder.scala index 68e420b7c7..eff1bef8a1 100644 --- a/src/library/scala/collection/generic/TraversableForwarder.scala +++ b/src/library/scala/collection/generic/TraversableForwarder.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import mutable.Buffer // import immutable.{List, Nil, ::, Stream} diff --git a/src/library/scala/collection/generic/TraversableProxyTemplate.scala b/src/library/scala/collection/generic/TraversableProxyTemplate.scala index b3f0fd5a48..3ab602fb35 100644 --- a/src/library/scala/collection/generic/TraversableProxyTemplate.scala +++ b/src/library/scala/collection/generic/TraversableProxyTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import collection.mutable.Buffer diff --git a/src/library/scala/collection/generic/TraversableTemplate.scala b/src/library/scala/collection/generic/TraversableTemplate.scala index 96aca0530a..21273a11bd 100644 --- a/src/library/scala/collection/generic/TraversableTemplate.scala +++ b/src/library/scala/collection/generic/TraversableTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ // import immutable.{List, Stream, Nil} //!!! import mutable.{Buffer, ArrayBuffer, ListBuffer} diff --git a/src/library/scala/collection/generic/TraversableView.scala b/src/library/scala/collection/generic/TraversableView.scala index 78e70bdb04..47eb3c22c7 100644 --- a/src/library/scala/collection/generic/TraversableView.scala +++ b/src/library/scala/collection/generic/TraversableView.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import TraversableView.NoBuilder diff --git a/src/library/scala/collection/generic/TraversableViewTemplate.scala b/src/library/scala/collection/generic/TraversableViewTemplate.scala index ec18eca433..6b8cdbd2ec 100644 --- a/src/library/scala/collection/generic/TraversableViewTemplate.scala +++ b/src/library/scala/collection/generic/TraversableViewTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import Math.MAX_INT import TraversableView.NoBuilder diff --git a/src/library/scala/collection/generic/VectorTemplate.scala b/src/library/scala/collection/generic/VectorTemplate.scala index daba1709cd..f494c67cbd 100644 --- a/src/library/scala/collection/generic/VectorTemplate.scala +++ b/src/library/scala/collection/generic/VectorTemplate.scala @@ -9,6 +9,7 @@ // $Id$ package scala.collection.generic +import scala.collection._ import mutable.ArrayBuffer diff --git a/src/library/scala/collection/generic/VectorView.scala b/src/library/scala/collection/generic/VectorView.scala index 41d2c98a19..65850e8a01 100644 --- a/src/library/scala/collection/generic/VectorView.scala +++ b/src/library/scala/collection/generic/VectorView.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import TraversableView.NoBuilder diff --git a/src/library/scala/collection/generic/VectorViewTemplate.scala b/src/library/scala/collection/generic/VectorViewTemplate.scala index a8dcc05180..f043a04685 100644 --- a/src/library/scala/collection/generic/VectorViewTemplate.scala +++ b/src/library/scala/collection/generic/VectorViewTemplate.scala @@ -10,6 +10,7 @@ package scala.collection.generic +import scala.collection._ import TraversableView.NoBuilder diff --git a/src/library/scala/collection/immutable/BitSet.scala b/src/library/scala/collection/immutable/BitSet.scala index 01c0d78b53..c645b30b56 100644 --- a/src/library/scala/collection/immutable/BitSet.scala +++ b/src/library/scala/collection/immutable/BitSet.scala @@ -11,7 +11,7 @@ package scala.collection.immutable -import generic._ +import scala.collection.generic._ import BitSetTemplate.{LogWL, updateArray} /** a base class for immutable bit sets diff --git a/src/library/scala/collection/immutable/HashMap.scala b/src/library/scala/collection/immutable/HashMap.scala index c20dc017f8..0849536755 100644 --- a/src/library/scala/collection/immutable/HashMap.scala +++ b/src/library/scala/collection/immutable/HashMap.scala @@ -11,7 +11,8 @@ package scala.collection.immutable -import generic._ +import scala.collection.generic._ +import scala.collection.mutable import annotation.unchecked.uncheckedVariance /** This class implements immutable maps using a hash table. diff --git a/src/library/scala/collection/immutable/HashSet.scala b/src/library/scala/collection/immutable/HashSet.scala index 215fe80914..9300164438 100644 --- a/src/library/scala/collection/immutable/HashSet.scala +++ b/src/library/scala/collection/immutable/HashSet.scala @@ -10,7 +10,8 @@ package scala.collection.immutable -import generic._ +import scala.collection.generic._ +import scala.collection.mutable /** This class implements immutable sets using a hash table. * It is optimized for sequential accesses where the last updated table is accessed most often. diff --git a/src/library/scala/collection/immutable/Iterable.scala b/src/library/scala/collection/immutable/Iterable.scala index 31d7d6db8d..649d2eafc5 100644 --- a/src/library/scala/collection/immutable/Iterable.scala +++ b/src/library/scala/collection/immutable/Iterable.scala @@ -1,6 +1,7 @@ package scala.collection.immutable -import generic._ +import scala.collection.generic._ +import scala.collection.mutable /** A subtrait of collection.Iterable which represents iterables * that cannot be mutated. diff --git a/src/library/scala/collection/immutable/LinearSequence.scala b/src/library/scala/collection/immutable/LinearSequence.scala index 6a9665e705..da4b364b74 100644 --- a/src/library/scala/collection/immutable/LinearSequence.scala +++ b/src/library/scala/collection/immutable/LinearSequence.scala @@ -1,6 +1,7 @@ package scala.collection.immutable -import generic._ +import scala.collection.generic._ +import scala.collection.mutable /** A subtrait of collection.Sequence which represents sequences * that cannot be mutated. diff --git a/src/library/scala/collection/immutable/List.scala b/src/library/scala/collection/immutable/List.scala index 78bb4a125e..29813152ad 100644 --- a/src/library/scala/collection/immutable/List.scala +++ b/src/library/scala/collection/immutable/List.scala @@ -11,8 +11,8 @@ package scala.collection.immutable -import mutable.ListBuffer -import generic._ +import scala.collection.mutable.ListBuffer +import scala.collection.generic._ /** A class representing an ordered collection of elements of type * <code>a</code>. This class comes with two implementing case @@ -221,8 +221,6 @@ sealed abstract class List[+A] extends LinearSequence[A] loop(drop(n), this) } - // dropRight is inherited from Stream - /** Split the list at a given point and return the two parts thus * created. * diff --git a/src/library/scala/collection/immutable/ListMap.scala b/src/library/scala/collection/immutable/ListMap.scala index 816018bf28..40ecc67381 100644 --- a/src/library/scala/collection/immutable/ListMap.scala +++ b/src/library/scala/collection/immutable/ListMap.scala @@ -12,7 +12,7 @@ package scala.collection.immutable -import generic._ +import scala.collection.generic._ /** The canonical factory of <a href="ListMap.html">ListMap</a>'s */ object ListMap extends ImmutableMapFactory[ListMap] { diff --git a/src/library/scala/collection/immutable/ListSet.scala b/src/library/scala/collection/immutable/ListSet.scala index 2a7fa22661..d3eac8f9f9 100644 --- a/src/library/scala/collection/immutable/ListSet.scala +++ b/src/library/scala/collection/immutable/ListSet.scala @@ -11,7 +11,7 @@ package scala.collection.immutable -import generic._ +import scala.collection.generic._ /** The canonical factory of <a href="ListSet.html">ListSet</a>'s */ object ListSet extends SetFactory[ListSet] { diff --git a/src/library/scala/collection/immutable/Map.scala b/src/library/scala/collection/immutable/Map.scala index ef3c3006f0..929d41bc99 100644 --- a/src/library/scala/collection/immutable/Map.scala +++ b/src/library/scala/collection/immutable/Map.scala @@ -11,7 +11,7 @@ package scala.collection.immutable -import generic._ +import scala.collection.generic._ trait Map[A, +B] extends Iterable[(A, B)] with collection.Map[A, B] diff --git a/src/library/scala/collection/immutable/MapProxy.scala b/src/library/scala/collection/immutable/MapProxy.scala index a2a1223cfe..1ad7219fc7 100644 --- a/src/library/scala/collection/immutable/MapProxy.scala +++ b/src/library/scala/collection/immutable/MapProxy.scala @@ -11,7 +11,7 @@ package scala.collection.immutable -import generic.MapProxyTemplate +import scala.collection.generic.MapProxyTemplate /** <p> * This is a simple wrapper class for <a href="Map.html" @@ -26,10 +26,10 @@ import generic.MapProxyTemplate * @version 2.0, 31/12/2006 */ -trait MapProxy[A, +B] extends immutable.Map[A, B] with MapProxyTemplate[A, B, immutable.Map[A, B]] +trait MapProxy[A, +B] extends Map[A, B] with MapProxyTemplate[A, B, Map[A, B]] { override def thisCollection = this - private def newProxy[B1 >: B](newSelf: immutable.Map[A, B1]): MapProxy[A, B1] = + private def newProxy[B1 >: B](newSelf: Map[A, B1]): MapProxy[A, B1] = new MapProxy[A, B1] { val self = newSelf } override def empty = newProxy(self.empty) @@ -39,4 +39,4 @@ trait MapProxy[A, +B] extends immutable.Map[A, B] with MapProxyTemplate[A, B, im override def + [B1 >: B](elem1: (A, B1), elem2: (A, B1), elems: (A, B1) *) = newProxy(self.+(elem1, elem2, elems: _*)) override def -(key: A) = newProxy(self - key) -}
\ No newline at end of file +} diff --git a/src/library/scala/collection/immutable/Queue.scala b/src/library/scala/collection/immutable/Queue.scala index f63545cbe7..1ba58f8df0 100644 --- a/src/library/scala/collection/immutable/Queue.scala +++ b/src/library/scala/collection/immutable/Queue.scala @@ -27,8 +27,7 @@ object Queue { @serializable class Queue[+A] protected( protected val in: List[A], - protected val out: List[A]) -extends immutable.Sequence[A] + protected val out: List[A]) extends Sequence[A] { /** Returns the <code>n</code>-th element of this queue. * The first element is at position 0. diff --git a/src/library/scala/collection/immutable/Sequence.scala b/src/library/scala/collection/immutable/Sequence.scala index 715cabb705..b58f8e16cf 100644 --- a/src/library/scala/collection/immutable/Sequence.scala +++ b/src/library/scala/collection/immutable/Sequence.scala @@ -7,7 +7,8 @@ \* */ package scala.collection.immutable -import generic._ +import scala.collection.generic._ +import scala.collection.mutable /** A subtrait of collection.Sequence which represents sequences * that cannot be mutated. diff --git a/src/library/scala/collection/immutable/Set.scala b/src/library/scala/collection/immutable/Set.scala index 9135306038..e03c232850 100644 --- a/src/library/scala/collection/immutable/Set.scala +++ b/src/library/scala/collection/immutable/Set.scala @@ -11,7 +11,7 @@ package scala.collection.immutable -import generic._ +import scala.collection.generic._ /** <p> * A generic trait for immutable sets. Concrete set implementations have diff --git a/src/library/scala/collection/immutable/SetProxy.scala b/src/library/scala/collection/immutable/SetProxy.scala index 4d7ef52d93..d33a4b68cc 100644 --- a/src/library/scala/collection/immutable/SetProxy.scala +++ b/src/library/scala/collection/immutable/SetProxy.scala @@ -8,7 +8,7 @@ package scala.collection.immutable -import generic.SetProxyTemplate +import scala.collection.generic.SetProxyTemplate /** <p> * This is a simple wrapper class for <a href="Set.html" @@ -20,10 +20,10 @@ import generic.SetProxyTemplate * </p> */ -trait SetProxy[A] extends immutable.Set[A] with SetProxyTemplate[A, immutable.Set[A]] +trait SetProxy[A] extends Set[A] with SetProxyTemplate[A, Set[A]] { override def thisCollection = this - private def newProxy[B >: A](newSelf: immutable.Set[B]): SetProxy[B] = + private def newProxy[B >: A](newSelf: Set[B]): SetProxy[B] = new SetProxy[B] { val self = newSelf } override def empty = newProxy(self.empty) diff --git a/src/library/scala/collection/immutable/SortedMap.scala b/src/library/scala/collection/immutable/SortedMap.scala index 85461b54c9..cc641e70f8 100644 --- a/src/library/scala/collection/immutable/SortedMap.scala +++ b/src/library/scala/collection/immutable/SortedMap.scala @@ -17,7 +17,7 @@ */ package scala.collection.immutable -import generic._ +import scala.collection.generic._ import annotation.unchecked.uncheckedVariance trait SortedMap[A, +B] extends Map[A, B] @@ -26,7 +26,7 @@ trait SortedMap[A, +B] extends Map[A, B] with SortedMapTemplate[A, B, SortedMap[A, B]] { override protected[this] def newBuilder : Builder[(A, B), SortedMap[A, B]] = - immutable.SortedMap.newBuilder[A, B] + SortedMap.newBuilder[A, B] override def updated [B1 >: B](key: A, value: B1): SortedMap[A, B1] = this + ((key, value)) diff --git a/src/library/scala/collection/immutable/SortedSet.scala b/src/library/scala/collection/immutable/SortedSet.scala index 911cfcba0a..80fd411acd 100644 --- a/src/library/scala/collection/immutable/SortedSet.scala +++ b/src/library/scala/collection/immutable/SortedSet.scala @@ -16,7 +16,7 @@ */ package scala.collection.immutable -import generic._ +import scala.collection.generic._ trait SortedSet[A] extends Set[A] with collection.SortedSet[A] with SortedSetTemplate[A, SortedSet[A]] { /** Needs to be overridden in subclasses. */ diff --git a/src/library/scala/collection/immutable/Stream.scala b/src/library/scala/collection/immutable/Stream.scala index ad20214bbb..862ac2cfc7 100644 --- a/src/library/scala/collection/immutable/Stream.scala +++ b/src/library/scala/collection/immutable/Stream.scala @@ -11,8 +11,8 @@ package scala.collection.immutable -import mutable.ListBuffer -import generic._ +import scala.collection.mutable.ListBuffer +import scala.collection.generic._ /** * <p>The class <code>Stream</code> implements lazy lists where elements diff --git a/src/library/scala/collection/immutable/Traversable.scala b/src/library/scala/collection/immutable/Traversable.scala index 398a0264c8..53fc96aae0 100644 --- a/src/library/scala/collection/immutable/Traversable.scala +++ b/src/library/scala/collection/immutable/Traversable.scala @@ -1,6 +1,7 @@ package scala.collection.immutable -import generic._ +import scala.collection.generic._ +import scala.collection.mutable /** A subtrait of Traversable in package collection which represents traversables * that cannot be mutated. diff --git a/src/library/scala/collection/immutable/TreeMap.scala b/src/library/scala/collection/immutable/TreeMap.scala index cff70586ab..c146064296 100644 --- a/src/library/scala/collection/immutable/TreeMap.scala +++ b/src/library/scala/collection/immutable/TreeMap.scala @@ -10,7 +10,7 @@ package scala.collection.immutable -import generic._ +import scala.collection.generic._ /** The canonical factory of <a href="TreeMap.html">TreeMap</a>'s. */ object TreeMap extends ImmutableSortedMapFactory[TreeMap] { diff --git a/src/library/scala/collection/immutable/TreeSet.scala b/src/library/scala/collection/immutable/TreeSet.scala index 36e4fc98c4..0e5496828a 100644 --- a/src/library/scala/collection/immutable/TreeSet.scala +++ b/src/library/scala/collection/immutable/TreeSet.scala @@ -11,7 +11,7 @@ package scala.collection.immutable -import generic._ +import scala.collection.generic._ /** The canonical factory of <a href="TreeSet.html">TreeSet</a>'s. */ object TreeSet extends SortedSetFactory[TreeSet]{ diff --git a/src/library/scala/collection/immutable/Vector.scala b/src/library/scala/collection/immutable/Vector.scala index 743ab9897d..27b69949c8 100644 --- a/src/library/scala/collection/immutable/Vector.scala +++ b/src/library/scala/collection/immutable/Vector.scala @@ -7,8 +7,8 @@ \* */ package scala.collection.immutable -import generic._ -import mutable.ArrayBuffer +import scala.collection.generic._ +import scala.collection.mutable.ArrayBuffer /** A subtrait of collection.Vector which represents sequences * that cannot be mutated. diff --git a/src/library/scala/collection/mutable/ArrayBuffer.scala b/src/library/scala/collection/mutable/ArrayBuffer.scala index d25c55f4af..d4986265a2 100644 --- a/src/library/scala/collection/mutable/ArrayBuffer.scala +++ b/src/library/scala/collection/mutable/ArrayBuffer.scala @@ -11,7 +11,7 @@ package scala.collection.mutable -import generic._ +import scala.collection.generic._ /** An implementation of the <code>Buffer</code> class using an array to * represent the assembled sequence internally. Append, update and random diff --git a/src/library/scala/collection/mutable/BitSet.scala b/src/library/scala/collection/mutable/BitSet.scala index 33fbebf324..383c6954cb 100644 --- a/src/library/scala/collection/mutable/BitSet.scala +++ b/src/library/scala/collection/mutable/BitSet.scala @@ -1,6 +1,7 @@ package scala.collection.mutable -import generic._ +import scala.collection.generic._ +import scala.collection.immutable import BitSetTemplate.{LogWL, updateArray} /** A class for mutable bitsets */ diff --git a/src/library/scala/collection/mutable/Buffer.scala b/src/library/scala/collection/mutable/Buffer.scala index 2099f134fc..fcbe4f655f 100644 --- a/src/library/scala/collection/mutable/Buffer.scala +++ b/src/library/scala/collection/mutable/Buffer.scala @@ -11,7 +11,7 @@ package scala.collection.mutable -import generic._ +import scala.collection.generic._ /** Buffers are used to create sequences of elements incrementally by * appending, prepending, or inserting new elements. It is also diff --git a/src/library/scala/collection/mutable/DoubleLinkedList.scala b/src/library/scala/collection/mutable/DoubleLinkedList.scala index aeaaf71808..3b28648489 100644 --- a/src/library/scala/collection/mutable/DoubleLinkedList.scala +++ b/src/library/scala/collection/mutable/DoubleLinkedList.scala @@ -13,7 +13,7 @@ package scala.collection.mutable -import generic._ +import scala.collection.generic._ /** This class implements single linked lists where both the head (<code>elem</code>) * and the tail (<code>next</code>) are mutable. diff --git a/src/library/scala/collection/mutable/HashMap.scala b/src/library/scala/collection/mutable/HashMap.scala index 255358ae1f..a8c2e14655 100644 --- a/src/library/scala/collection/mutable/HashMap.scala +++ b/src/library/scala/collection/mutable/HashMap.scala @@ -11,7 +11,7 @@ package scala.collection.mutable -import generic._ +import scala.collection.generic._ @serializable diff --git a/src/library/scala/collection/mutable/HashSet.scala b/src/library/scala/collection/mutable/HashSet.scala index 20e5a1e6b5..12b7398db1 100644 --- a/src/library/scala/collection/mutable/HashSet.scala +++ b/src/library/scala/collection/mutable/HashSet.scala @@ -11,7 +11,7 @@ package scala.collection.mutable -import generic._ +import scala.collection.generic._ /** This class implements mutable sets using a hashtable. * diff --git a/src/library/scala/collection/mutable/Iterable.scala b/src/library/scala/collection/mutable/Iterable.scala index 41a88af7f8..2a8c4eb773 100644 --- a/src/library/scala/collection/mutable/Iterable.scala +++ b/src/library/scala/collection/mutable/Iterable.scala @@ -7,7 +7,7 @@ \* */ package scala.collection.mutable -import generic._ +import scala.collection.generic._ /** <p> * A subtrait of <a href="../Iterable.html" target="contentFrame"> diff --git a/src/library/scala/collection/mutable/LinearSequence.scala b/src/library/scala/collection/mutable/LinearSequence.scala index 3d71be1f81..59bd14fead 100644 --- a/src/library/scala/collection/mutable/LinearSequence.scala +++ b/src/library/scala/collection/mutable/LinearSequence.scala @@ -1,6 +1,6 @@ package scala.collection.mutable -import generic._ +import scala.collection.generic._ /** A subtrait of collection.Sequence which represents sequences * that cannot be mutated. diff --git a/src/library/scala/collection/mutable/LinkedHashMap.scala b/src/library/scala/collection/mutable/LinkedHashMap.scala index 4a64b9e8ce..84a74b25c1 100644 --- a/src/library/scala/collection/mutable/LinkedHashMap.scala +++ b/src/library/scala/collection/mutable/LinkedHashMap.scala @@ -12,7 +12,7 @@ package scala.collection.mutable import Predef._ -import generic._ +import scala.collection.generic._ /** This class implements mutable maps using a hashtable. * diff --git a/src/library/scala/collection/mutable/LinkedHashSet.scala b/src/library/scala/collection/mutable/LinkedHashSet.scala index f2825db975..d746f834b5 100644 --- a/src/library/scala/collection/mutable/LinkedHashSet.scala +++ b/src/library/scala/collection/mutable/LinkedHashSet.scala @@ -10,7 +10,7 @@ package scala.collection.mutable -import generic._ +import scala.collection.generic._ /** Todo: this has O(n) cost for element removal. * Should be rewritten to be more efficient. diff --git a/src/library/scala/collection/mutable/LinkedList.scala b/src/library/scala/collection/mutable/LinkedList.scala index 90c88439b4..b02b2bc90b 100644 --- a/src/library/scala/collection/mutable/LinkedList.scala +++ b/src/library/scala/collection/mutable/LinkedList.scala @@ -11,7 +11,7 @@ package scala.collection.mutable -import generic._ +import scala.collection.generic._ /** This class implements single linked lists where both the head (<code>elem</code>) * and the tail (<code>next</code>) are mutable. diff --git a/src/library/scala/collection/mutable/ListBuffer.scala b/src/library/scala/collection/mutable/ListBuffer.scala index c75e18dcd1..d1d0bb62ed 100644 --- a/src/library/scala/collection/mutable/ListBuffer.scala +++ b/src/library/scala/collection/mutable/ListBuffer.scala @@ -11,8 +11,8 @@ package scala.collection.mutable -import generic._ -// import immutable.{List, Nil, ::} +import scala.collection.generic._ +import scala.collection.immutable /** A Buffer implementation back up by a list. It provides constant time * prepend and append. Most other operations are linear. diff --git a/src/library/scala/collection/mutable/ListMap.scala b/src/library/scala/collection/mutable/ListMap.scala index a0d844cb5d..3bdca762e2 100644 --- a/src/library/scala/collection/mutable/ListMap.scala +++ b/src/library/scala/collection/mutable/ListMap.scala @@ -11,7 +11,7 @@ package scala.collection.mutable -import generic._ +import scala.collection.generic._ @serializable class ListMap[A, B] extends Map[A, B] with MutableMapTemplate[A, B, ListMap[A, B]] { diff --git a/src/library/scala/collection/mutable/Map.scala b/src/library/scala/collection/mutable/Map.scala index eab5b426a8..c59211fc96 100644 --- a/src/library/scala/collection/mutable/Map.scala +++ b/src/library/scala/collection/mutable/Map.scala @@ -11,7 +11,7 @@ package scala.collection.mutable -import generic._ +import scala.collection.generic._ trait Map[A, B] extends Iterable[(A, B)] diff --git a/src/library/scala/collection/mutable/MapProxy.scala b/src/library/scala/collection/mutable/MapProxy.scala index 92fb1c85a2..051f92f62a 100644 --- a/src/library/scala/collection/mutable/MapProxy.scala +++ b/src/library/scala/collection/mutable/MapProxy.scala @@ -11,7 +11,7 @@ package scala.collection.mutable -import generic.MapProxyTemplate +import scala.collection.generic.MapProxyTemplate /** <p> * This is a simple wrapper class for <a href="Map.html" @@ -26,7 +26,7 @@ import generic.MapProxyTemplate * @version 2.0, 31/12/2006 */ -trait MapProxy[A, B] extends mutable.Map[A, B] with MapProxyTemplate[A, B, mutable.Map[A, B]] +trait MapProxy[A, B] extends Map[A, B] with MapProxyTemplate[A, B, Map[A, B]] { override def thisCollection = this override def empty: MapProxy[A, B] = new MapProxy[A, B] { val self = MapProxy.this.self.empty } @@ -39,4 +39,4 @@ trait MapProxy[A, B] extends mutable.Map[A, B] with MapProxyTemplate[A, B, mutab override def += (kv: (A, B)) = { self += kv ; this } override def -= (key: A) = { self -= key ; this } -}
\ No newline at end of file +} diff --git a/src/library/scala/collection/mutable/MutableList.scala b/src/library/scala/collection/mutable/MutableList.scala index ce9060acf8..2a001e187c 100644 --- a/src/library/scala/collection/mutable/MutableList.scala +++ b/src/library/scala/collection/mutable/MutableList.scala @@ -11,7 +11,7 @@ package scala.collection.mutable -import generic._ +import scala.collection.generic._ // import immutable.{List, Nil, ::} //import Predef.NoSuchElementException diff --git a/src/library/scala/collection/mutable/ObservableBuffer.scala b/src/library/scala/collection/mutable/ObservableBuffer.scala index 7cda49d2fa..59f1fad220 100644 --- a/src/library/scala/collection/mutable/ObservableBuffer.scala +++ b/src/library/scala/collection/mutable/ObservableBuffer.scala @@ -11,7 +11,7 @@ package scala.collection.mutable -import script._ +import scala.collection.script._ /** This class is typically used as a mixin. It adds a subscription * mechanism to the <code>Buffer</code> class into which this abstract @@ -65,4 +65,4 @@ trait ObservableBuffer[A, This <: ObservableBuffer[A, This]] def undo { throw new UnsupportedOperationException("cannot undo") } }) } -}
\ No newline at end of file +} diff --git a/src/library/scala/collection/mutable/ObservableMap.scala b/src/library/scala/collection/mutable/ObservableMap.scala index b4fe6c8693..c43fd8ab9b 100644 --- a/src/library/scala/collection/mutable/ObservableMap.scala +++ b/src/library/scala/collection/mutable/ObservableMap.scala @@ -11,7 +11,7 @@ package scala.collection.mutable -import script._ +import scala.collection.script._ /** This class is typically used as a mixin. It adds a subscription diff --git a/src/library/scala/collection/mutable/ObservableSet.scala b/src/library/scala/collection/mutable/ObservableSet.scala index 31dd10c8b9..d01d8803da 100644 --- a/src/library/scala/collection/mutable/ObservableSet.scala +++ b/src/library/scala/collection/mutable/ObservableSet.scala @@ -11,7 +11,7 @@ package scala.collection.mutable -import script._ +import scala.collection.script._ /** This class is typically used as a mixin. It adds a subscription * mechanism to the <code>Set</code> class into which this abstract diff --git a/src/library/scala/collection/mutable/PriorityQueue.scala b/src/library/scala/collection/mutable/PriorityQueue.scala index f0b4e537e9..b1bc75f762 100644 --- a/src/library/scala/collection/mutable/PriorityQueue.scala +++ b/src/library/scala/collection/mutable/PriorityQueue.scala @@ -11,7 +11,7 @@ package scala.collection.mutable -import generic.{ Addable, Cloneable, Growable } +import scala.collection.generic.{ Addable, Cloneable, Growable } /** This class implements priority queues using a heap. diff --git a/src/library/scala/collection/mutable/Queue.scala b/src/library/scala/collection/mutable/Queue.scala index 14736dccf9..4c6d1a2320 100644 --- a/src/library/scala/collection/mutable/Queue.scala +++ b/src/library/scala/collection/mutable/Queue.scala @@ -11,7 +11,7 @@ package scala.collection.mutable -import generic._ +import scala.collection.generic._ /** <code>Queue</code> objects implement data structures that allow to * insert and retrieve elements in a first-in-first-out (FIFO) manner. diff --git a/src/library/scala/collection/mutable/ResizableArray.scala b/src/library/scala/collection/mutable/ResizableArray.scala index 6f8d58ad47..5a6a5a187b 100644 --- a/src/library/scala/collection/mutable/ResizableArray.scala +++ b/src/library/scala/collection/mutable/ResizableArray.scala @@ -11,7 +11,7 @@ package scala.collection.mutable -import generic._ +import scala.collection.generic._ /** This class is used internally to implement data structures that * are based on resizable arrays. diff --git a/src/library/scala/collection/mutable/Sequence.scala b/src/library/scala/collection/mutable/Sequence.scala index 4f460f74c7..6ce3afae33 100644 --- a/src/library/scala/collection/mutable/Sequence.scala +++ b/src/library/scala/collection/mutable/Sequence.scala @@ -7,7 +7,7 @@ \* */ package scala.collection.mutable -import generic._ +import scala.collection.generic._ /** A subtrait of collection.Sequence which represents sequences * that can be mutated. diff --git a/src/library/scala/collection/mutable/Set.scala b/src/library/scala/collection/mutable/Set.scala index d17dee1753..55c3d3f1aa 100644 --- a/src/library/scala/collection/mutable/Set.scala +++ b/src/library/scala/collection/mutable/Set.scala @@ -11,7 +11,7 @@ package scala.collection.mutable -import generic._ +import scala.collection.generic._ /** A generic trait for mutable sets. Concrete set implementations * have to provide functionality for the abstract methods in Set: diff --git a/src/library/scala/collection/mutable/SetProxy.scala b/src/library/scala/collection/mutable/SetProxy.scala index 0b032816eb..0ff57ee366 100644 --- a/src/library/scala/collection/mutable/SetProxy.scala +++ b/src/library/scala/collection/mutable/SetProxy.scala @@ -10,7 +10,7 @@ package scala.collection.mutable -import generic.SetProxyTemplate +import scala.collection.generic.SetProxyTemplate /** This is a simple wrapper class for <a href="Set.html" * target="contentFrame"><code>scala.collection.mutable.Set</code></a>. @@ -20,7 +20,7 @@ import generic.SetProxyTemplate * @author Matthias Zenger * @version 1.1, 09/05/2004 */ -trait SetProxy[A] extends mutable.Set[A] with SetProxyTemplate[A, mutable.Set[A]] +trait SetProxy[A] extends Set[A] with SetProxyTemplate[A, Set[A]] { override def thisCollection = this override def empty = new SetProxy[A] { val self = SetProxy.this.self.empty } @@ -29,4 +29,4 @@ trait SetProxy[A] extends mutable.Set[A] with SetProxyTemplate[A, mutable.Set[A] def +=(elem: A) = { self += elem; this } def -=(elem: A) = { self -= elem; this } -}
\ No newline at end of file +} diff --git a/src/library/scala/collection/mutable/Stack.scala b/src/library/scala/collection/mutable/Stack.scala index 637a414c5a..30caec89be 100644 --- a/src/library/scala/collection/mutable/Stack.scala +++ b/src/library/scala/collection/mutable/Stack.scala @@ -11,7 +11,7 @@ package scala.collection.mutable -import generic._ +import scala.collection.generic._ /** A stack implements a data structure which allows to store and retrieve * objects in a last-in-first-out (LIFO) fashion. diff --git a/src/library/scala/collection/mutable/Traversable.scala b/src/library/scala/collection/mutable/Traversable.scala index f6d2433be2..025100fb91 100644 --- a/src/library/scala/collection/mutable/Traversable.scala +++ b/src/library/scala/collection/mutable/Traversable.scala @@ -7,7 +7,7 @@ \* */ package scala.collection.mutable -import generic._ +import scala.collection.generic._ /** A subtrait of collection.Traversable which represents traversables * that can be mutated. diff --git a/src/library/scala/collection/mutable/Vector.scala b/src/library/scala/collection/mutable/Vector.scala index db082bb09d..6bd5bf3fdb 100644 --- a/src/library/scala/collection/mutable/Vector.scala +++ b/src/library/scala/collection/mutable/Vector.scala @@ -7,7 +7,7 @@ \* */ package scala.collection.mutable -import generic._ +import scala.collection.generic._ /** A subtrait of collection.Vector which represents sequences * that can be mutated. diff --git a/src/library/scala/collection/mutable/WeakHashMap.scala b/src/library/scala/collection/mutable/WeakHashMap.scala index 7520026e01..9ecbcfb586 100644 --- a/src/library/scala/collection/mutable/WeakHashMap.scala +++ b/src/library/scala/collection/mutable/WeakHashMap.scala @@ -11,7 +11,7 @@ package scala.collection.mutable -import JavaConversions._ +import scala.collection.JavaConversions._ class WeakHashMap[A, B] extends JMapWrapper[A, B](new java.util.WeakHashMap) { override def empty = new WeakHashMap[A, B] diff --git a/src/library/scala/collection/script/Message.scala b/src/library/scala/collection/script/Message.scala index c4bf81eebc..b333c83fb7 100644 --- a/src/library/scala/collection/script/Message.scala +++ b/src/library/scala/collection/script/Message.scala @@ -10,6 +10,7 @@ package scala.collection.script +import scala.collection._ import Predef._ import mutable.ArrayBuffer diff --git a/src/library/scala/util/parsing/combinator/lexical/Lexical.scala b/src/library/scala/util/parsing/combinator/lexical/Lexical.scala index 62d49d48af..f6a85ac452 100644 --- a/src/library/scala/util/parsing/combinator/lexical/Lexical.scala +++ b/src/library/scala/util/parsing/combinator/lexical/Lexical.scala @@ -10,6 +10,7 @@ package scala.util.parsing.combinator.lexical +import scala.util.parsing.combinator._ import scala.util.parsing.syntax._ import scala.util.parsing.input.CharArrayReader.EofCh diff --git a/src/library/scala/util/parsing/combinator/lexical/Scanners.scala b/src/library/scala/util/parsing/combinator/lexical/Scanners.scala index fd5693c118..2318f660f6 100644 --- a/src/library/scala/util/parsing/combinator/lexical/Scanners.scala +++ b/src/library/scala/util/parsing/combinator/lexical/Scanners.scala @@ -10,6 +10,7 @@ package scala.util.parsing.combinator.lexical +import scala.util.parsing.combinator._ import scala.util.parsing.syntax._ import scala.util.parsing.input._ diff --git a/src/library/scala/util/parsing/combinator/lexical/StdLexical.scala b/src/library/scala/util/parsing/combinator/lexical/StdLexical.scala index 9cacf37ca2..924e4d16d7 100644 --- a/src/library/scala/util/parsing/combinator/lexical/StdLexical.scala +++ b/src/library/scala/util/parsing/combinator/lexical/StdLexical.scala @@ -10,6 +10,7 @@ package scala.util.parsing.combinator.lexical +import scala.util.parsing.combinator._ import scala.util.parsing.syntax._ import scala.util.parsing.input.CharArrayReader.EofCh diff --git a/src/library/scala/util/parsing/combinator/syntactical/StandardTokenParsers.scala b/src/library/scala/util/parsing/combinator/syntactical/StandardTokenParsers.scala index bed664d71e..2809b503a7 100644 --- a/src/library/scala/util/parsing/combinator/syntactical/StandardTokenParsers.scala +++ b/src/library/scala/util/parsing/combinator/syntactical/StandardTokenParsers.scala @@ -10,6 +10,7 @@ package scala.util.parsing.combinator.syntactical +import scala.util.parsing.combinator._ import scala.util.parsing.syntax._ import scala.util.parsing.combinator.lexical.StdLexical diff --git a/src/library/scala/util/parsing/combinator/syntactical/StdTokenParsers.scala b/src/library/scala/util/parsing/combinator/syntactical/StdTokenParsers.scala index 42e910134b..18f51b1511 100644 --- a/src/library/scala/util/parsing/combinator/syntactical/StdTokenParsers.scala +++ b/src/library/scala/util/parsing/combinator/syntactical/StdTokenParsers.scala @@ -10,6 +10,7 @@ package scala.util.parsing.combinator.syntactical +import scala.util.parsing.combinator._ import scala.util.parsing.syntax._ import scala.collection.mutable.HashMap diff --git a/src/library/scala/util/parsing/combinator/syntactical/TokenParsers.scala b/src/library/scala/util/parsing/combinator/syntactical/TokenParsers.scala index 651676e094..5c90c46df7 100644 --- a/src/library/scala/util/parsing/combinator/syntactical/TokenParsers.scala +++ b/src/library/scala/util/parsing/combinator/syntactical/TokenParsers.scala @@ -10,6 +10,7 @@ package scala.util.parsing.combinator.syntactical +import scala.util.parsing.combinator._ /** <p> * This is the core component for token-based parsers. diff --git a/src/library/scala/util/parsing/combinator/testing/Tester.scala b/src/library/scala/util/parsing/combinator/testing/Tester.scala index e9a621e222..8af0ce2d4b 100644 --- a/src/library/scala/util/parsing/combinator/testing/Tester.scala +++ b/src/library/scala/util/parsing/combinator/testing/Tester.scala @@ -9,6 +9,7 @@ // $Id$ package scala.util.parsing.combinator.testing +import scala.util.parsing.combinator._ import scala.util.parsing.combinator.lexical.Lexical import scala.util.parsing.combinator.syntactical.TokenParsers diff --git a/src/library/scala/util/parsing/json/JSON.scala b/src/library/scala/util/parsing/json/JSON.scala index 7f7bb34b52..75e25062ca 100644 --- a/src/library/scala/util/parsing/json/JSON.scala +++ b/src/library/scala/util/parsing/json/JSON.scala @@ -10,6 +10,9 @@ package scala.util.parsing.json +import scala.util.parsing.combinator._ +import scala.util.parsing.combinator.syntactical._ +import scala.util.parsing.combinator.lexical._ /** * This object provides a simple interface to the JSON parser class. The default conversion diff --git a/src/library/scala/xml/dtd/ContentModel.scala b/src/library/scala/xml/dtd/ContentModel.scala index 24d7840ec3..085d33f56a 100644 --- a/src/library/scala/xml/dtd/ContentModel.scala +++ b/src/library/scala/xml/dtd/ContentModel.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.dtd +package scala.xml +package dtd import scala.util.regexp.WordExp import scala.util.automata.{DetWordAutom, SubsetConstruction, WordBerrySethi} diff --git a/src/library/scala/xml/dtd/ContentModelParser.scala b/src/library/scala/xml/dtd/ContentModelParser.scala index d9912ee0f8..a7c1f3b4e1 100644 --- a/src/library/scala/xml/dtd/ContentModelParser.scala +++ b/src/library/scala/xml/dtd/ContentModelParser.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.dtd +package scala.xml +package dtd /** Parser for regexps (content models in DTD element declarations) */ diff --git a/src/library/scala/xml/dtd/DTD.scala b/src/library/scala/xml/dtd/DTD.scala index a64e40fa92..d5654d4ee6 100644 --- a/src/library/scala/xml/dtd/DTD.scala +++ b/src/library/scala/xml/dtd/DTD.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.dtd +package scala.xml +package dtd import scala.collection.mutable.{HashMap, Map} diff --git a/src/library/scala/xml/dtd/Decl.scala b/src/library/scala/xml/dtd/Decl.scala index af7ef47fef..9f987b4175 100644 --- a/src/library/scala/xml/dtd/Decl.scala +++ b/src/library/scala/xml/dtd/Decl.scala @@ -9,7 +9,9 @@ // $Id$ -package scala.xml.dtd +package scala.xml +package dtd + import Utility.sbToString abstract class Decl diff --git a/src/library/scala/xml/dtd/DocType.scala b/src/library/scala/xml/dtd/DocType.scala index eb5eb27c55..3f95f0f87d 100644 --- a/src/library/scala/xml/dtd/DocType.scala +++ b/src/library/scala/xml/dtd/DocType.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.dtd +package scala.xml +package dtd /** An XML node for document type declaration. * diff --git a/src/library/scala/xml/dtd/DtdTypeSymbol.scala b/src/library/scala/xml/dtd/DtdTypeSymbol.scala index 8b857db9a4..10930261ae 100644 --- a/src/library/scala/xml/dtd/DtdTypeSymbol.scala +++ b/src/library/scala/xml/dtd/DtdTypeSymbol.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.dtd +package scala.xml +package dtd trait DtdTypeSymbol diff --git a/src/library/scala/xml/dtd/ElementValidator.scala b/src/library/scala/xml/dtd/ElementValidator.scala index 53fe483bc2..cb64c20f8d 100644 --- a/src/library/scala/xml/dtd/ElementValidator.scala +++ b/src/library/scala/xml/dtd/ElementValidator.scala @@ -9,8 +9,8 @@ // $Id$ -package scala.xml.dtd - +package scala.xml +package dtd import ContentModel.ElemName import scala.util.automata._ diff --git a/src/library/scala/xml/dtd/ExternalID.scala b/src/library/scala/xml/dtd/ExternalID.scala index c59a5032c8..2df8994d17 100644 --- a/src/library/scala/xml/dtd/ExternalID.scala +++ b/src/library/scala/xml/dtd/ExternalID.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.dtd +package scala.xml +package dtd /** an ExternalIDs - either PublicID or SystemID * diff --git a/src/library/scala/xml/dtd/Scanner.scala b/src/library/scala/xml/dtd/Scanner.scala index 49f36aabf9..abef812422 100644 --- a/src/library/scala/xml/dtd/Scanner.scala +++ b/src/library/scala/xml/dtd/Scanner.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.dtd +package scala.xml +package dtd /** Scanner for regexps (content models in DTD element declarations) diff --git a/src/library/scala/xml/dtd/Tokens.scala b/src/library/scala/xml/dtd/Tokens.scala index 73834e3838..c3466ee0e7 100644 --- a/src/library/scala/xml/dtd/Tokens.scala +++ b/src/library/scala/xml/dtd/Tokens.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.dtd +package scala.xml +package dtd class Tokens { diff --git a/src/library/scala/xml/dtd/ValidationException.scala b/src/library/scala/xml/dtd/ValidationException.scala index a05233a031..b77aab7d6c 100644 --- a/src/library/scala/xml/dtd/ValidationException.scala +++ b/src/library/scala/xml/dtd/ValidationException.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.dtd +package scala.xml +package dtd case class ValidationException(e: String) extends Exception(e) diff --git a/src/library/scala/xml/factory/Binder.scala b/src/library/scala/xml/factory/Binder.scala index b53aa64d9b..e2e0821aaf 100644 --- a/src/library/scala/xml/factory/Binder.scala +++ b/src/library/scala/xml/factory/Binder.scala @@ -9,8 +9,8 @@ // $Id$ -package scala.xml.factory - +package scala.xml +package factory import scala.xml.parsing.ValidatingMarkupHandler diff --git a/src/library/scala/xml/factory/LoggedNodeFactory.scala b/src/library/scala/xml/factory/LoggedNodeFactory.scala index 5fee5a5a2b..1b12b63dcc 100644 --- a/src/library/scala/xml/factory/LoggedNodeFactory.scala +++ b/src/library/scala/xml/factory/LoggedNodeFactory.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.factory +package scala.xml +package factory /** <p> diff --git a/src/library/scala/xml/factory/NodeFactory.scala b/src/library/scala/xml/factory/NodeFactory.scala index 718240760d..5b4ba2d822 100644 --- a/src/library/scala/xml/factory/NodeFactory.scala +++ b/src/library/scala/xml/factory/NodeFactory.scala @@ -8,7 +8,8 @@ // $Id$ -package scala.xml.factory +package scala.xml +package factory import parsing.{ FactoryAdapter, NoBindingFactoryAdapter } import org.xml.sax.InputSource diff --git a/src/library/scala/xml/factory/XMLLoader.scala b/src/library/scala/xml/factory/XMLLoader.scala index 8526d6d623..50ad1cfc25 100644 --- a/src/library/scala/xml/factory/XMLLoader.scala +++ b/src/library/scala/xml/factory/XMLLoader.scala @@ -8,7 +8,8 @@ // $Id$ -package scala.xml.factory +package scala.xml +package factory import parsing.{ FactoryAdapter, NoBindingFactoryAdapter } import org.xml.sax.InputSource @@ -57,4 +58,4 @@ trait XMLLoader[T <: Node] /** Loads XML from the given String. */ def loadString(string: String): T = loadXML(fromString(string), parser) -}
\ No newline at end of file +} diff --git a/src/library/scala/xml/include/CircularIncludeException.scala b/src/library/scala/xml/include/CircularIncludeException.scala index 300267ad79..94efca2b02 100644 --- a/src/library/scala/xml/include/CircularIncludeException.scala +++ b/src/library/scala/xml/include/CircularIncludeException.scala @@ -8,7 +8,8 @@ // $Id$ -package scala.xml.include +package scala.xml +package include /** * <p> diff --git a/src/library/scala/xml/include/UnavailableResourceException.scala b/src/library/scala/xml/include/UnavailableResourceException.scala index 2510916f83..d2e26e0d19 100644 --- a/src/library/scala/xml/include/UnavailableResourceException.scala +++ b/src/library/scala/xml/include/UnavailableResourceException.scala @@ -8,7 +8,8 @@ // $Id$ -package scala.xml.include +package scala.xml +package include /** * <p> diff --git a/src/library/scala/xml/include/XIncludeException.scala b/src/library/scala/xml/include/XIncludeException.scala index 6580957897..83a339562a 100644 --- a/src/library/scala/xml/include/XIncludeException.scala +++ b/src/library/scala/xml/include/XIncludeException.scala @@ -8,7 +8,8 @@ // $Id$ -package scala.xml.include +package scala.xml +package include /** * <p> diff --git a/src/library/scala/xml/include/sax/EncodingHeuristics.scala b/src/library/scala/xml/include/sax/EncodingHeuristics.scala index 888cf378f1..ad08ef68cf 100644 --- a/src/library/scala/xml/include/sax/EncodingHeuristics.scala +++ b/src/library/scala/xml/include/sax/EncodingHeuristics.scala @@ -8,7 +8,9 @@ // $Id$ -package scala.xml.include.sax +package scala.xml +package include.sax +import scala.xml.include._ import java.io.InputStream import scala.util.matching.Regex diff --git a/src/library/scala/xml/include/sax/Main.scala b/src/library/scala/xml/include/sax/Main.scala index 5190b98fea..23b379af2b 100644 --- a/src/library/scala/xml/include/sax/Main.scala +++ b/src/library/scala/xml/include/sax/Main.scala @@ -8,7 +8,9 @@ // $Id$ -package scala.xml.include.sax +package scala.xml +package include.sax +import scala.xml.include._ import org.xml.sax.SAXException import org.xml.sax.SAXParseException diff --git a/src/library/scala/xml/include/sax/XIncludeFilter.scala b/src/library/scala/xml/include/sax/XIncludeFilter.scala index e4b1d4fbc8..ed8953ea69 100644 --- a/src/library/scala/xml/include/sax/XIncludeFilter.scala +++ b/src/library/scala/xml/include/sax/XIncludeFilter.scala @@ -8,7 +8,9 @@ // $Id$ -package scala.xml.include.sax +package scala.xml +package include.sax +import scala.xml.include._ import org.xml.sax.Attributes import org.xml.sax.SAXException diff --git a/src/library/scala/xml/include/sax/XIncluder.scala b/src/library/scala/xml/include/sax/XIncluder.scala index 212ea79c99..d27c518488 100644 --- a/src/library/scala/xml/include/sax/XIncluder.scala +++ b/src/library/scala/xml/include/sax/XIncluder.scala @@ -8,7 +8,9 @@ // $Id$ -package scala.xml.include.sax +package scala.xml +package include.sax +import scala.xml.include._ import org.xml.sax.SAXException import org.xml.sax.SAXParseException diff --git a/src/library/scala/xml/parsing/ConstructingHandler.scala b/src/library/scala/xml/parsing/ConstructingHandler.scala index f21cca2a7f..a213a72590 100644 --- a/src/library/scala/xml/parsing/ConstructingHandler.scala +++ b/src/library/scala/xml/parsing/ConstructingHandler.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.parsing +package scala.xml +package parsing /** Implementation of MarkupHandler that constructs nodes. * diff --git a/src/library/scala/xml/parsing/ConstructingParser.scala b/src/library/scala/xml/parsing/ConstructingParser.scala index 1a5119baf8..623d2e3f37 100644 --- a/src/library/scala/xml/parsing/ConstructingParser.scala +++ b/src/library/scala/xml/parsing/ConstructingParser.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.parsing +package scala.xml +package parsing import java.io.File diff --git a/src/library/scala/xml/parsing/DefaultMarkupHandler.scala b/src/library/scala/xml/parsing/DefaultMarkupHandler.scala index 9d2bdabaad..68750b6fa2 100644 --- a/src/library/scala/xml/parsing/DefaultMarkupHandler.scala +++ b/src/library/scala/xml/parsing/DefaultMarkupHandler.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.parsing +package scala.xml +package parsing /** default implemenation of markup handler always returns NodeSeq.Empty */ diff --git a/src/library/scala/xml/parsing/ExternalSources.scala b/src/library/scala/xml/parsing/ExternalSources.scala index 832da420c9..01bbcb356d 100644 --- a/src/library/scala/xml/parsing/ExternalSources.scala +++ b/src/library/scala/xml/parsing/ExternalSources.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.parsing +package scala.xml +package parsing import java.net.URL diff --git a/src/library/scala/xml/parsing/FactoryAdapter.scala b/src/library/scala/xml/parsing/FactoryAdapter.scala index f212761db6..8353f4177f 100644 --- a/src/library/scala/xml/parsing/FactoryAdapter.scala +++ b/src/library/scala/xml/parsing/FactoryAdapter.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.parsing +package scala.xml +package parsing import java.io.{InputStream, Reader, File, FileDescriptor, FileInputStream} import scala.collection.mutable.Stack diff --git a/src/library/scala/xml/parsing/FatalError.scala b/src/library/scala/xml/parsing/FatalError.scala index 8974629ee1..3a1f408df8 100644 --- a/src/library/scala/xml/parsing/FatalError.scala +++ b/src/library/scala/xml/parsing/FatalError.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.parsing; +package scala.xml +package parsing; case class FatalError(msg:String) extends java.lang.RuntimeException(msg); diff --git a/src/library/scala/xml/parsing/MarkupHandler.scala b/src/library/scala/xml/parsing/MarkupHandler.scala index e49254f386..62a87f286c 100644 --- a/src/library/scala/xml/parsing/MarkupHandler.scala +++ b/src/library/scala/xml/parsing/MarkupHandler.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.parsing +package scala.xml +package parsing import scala.collection.mutable.{HashMap, Map} import scala.io.Source diff --git a/src/library/scala/xml/parsing/MarkupParser.scala b/src/library/scala/xml/parsing/MarkupParser.scala index 369c0010e7..fa60329456 100644 --- a/src/library/scala/xml/parsing/MarkupParser.scala +++ b/src/library/scala/xml/parsing/MarkupParser.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.parsing +package scala.xml +package parsing import scala.io.Source import scala.xml.dtd._ diff --git a/src/library/scala/xml/parsing/NoBindingFactoryAdapter.scala b/src/library/scala/xml/parsing/NoBindingFactoryAdapter.scala index ee0b8a9ec0..6f01886bb2 100644 --- a/src/library/scala/xml/parsing/NoBindingFactoryAdapter.scala +++ b/src/library/scala/xml/parsing/NoBindingFactoryAdapter.scala @@ -8,7 +8,8 @@ // $Id$ -package scala.xml.parsing +package scala.xml +package parsing import scala.xml.factory.NodeFactory import org.xml.sax.InputSource diff --git a/src/library/scala/xml/parsing/TokenTests.scala b/src/library/scala/xml/parsing/TokenTests.scala index 2fd6e39ec7..e4d9b371f8 100644 --- a/src/library/scala/xml/parsing/TokenTests.scala +++ b/src/library/scala/xml/parsing/TokenTests.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.parsing; +package scala.xml +package parsing; /** diff --git a/src/library/scala/xml/parsing/ValidatingMarkupHandler.scala b/src/library/scala/xml/parsing/ValidatingMarkupHandler.scala index 087238ac3d..a1e191dea8 100644 --- a/src/library/scala/xml/parsing/ValidatingMarkupHandler.scala +++ b/src/library/scala/xml/parsing/ValidatingMarkupHandler.scala @@ -9,8 +9,8 @@ // $Id$ -package scala.xml.parsing - +package scala.xml +package parsing import scala.xml.dtd._ import scala.util.logging.Logged diff --git a/src/library/scala/xml/parsing/XhtmlEntities.scala b/src/library/scala/xml/parsing/XhtmlEntities.scala index 53dd24c140..bb704b3c06 100644 --- a/src/library/scala/xml/parsing/XhtmlEntities.scala +++ b/src/library/scala/xml/parsing/XhtmlEntities.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.parsing +package scala.xml +package parsing import scala.xml.dtd.{IntDef, ParsedEntityDecl} diff --git a/src/library/scala/xml/parsing/XhtmlParser.scala b/src/library/scala/xml/parsing/XhtmlParser.scala index 67482beb58..1b395a2739 100644 --- a/src/library/scala/xml/parsing/XhtmlParser.scala +++ b/src/library/scala/xml/parsing/XhtmlParser.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.parsing +package scala.xml +package parsing import scala.io.Source diff --git a/src/library/scala/xml/path/Expression.scala b/src/library/scala/xml/path/Expression.scala index b62414c889..30de790a3c 100644 --- a/src/library/scala/xml/path/Expression.scala +++ b/src/library/scala/xml/path/Expression.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.path +package scala.xml +package path object Expression { diff --git a/src/library/scala/xml/persistent/CachedFileStorage.scala b/src/library/scala/xml/persistent/CachedFileStorage.scala index aa958b68ea..923e8c2557 100644 --- a/src/library/scala/xml/persistent/CachedFileStorage.scala +++ b/src/library/scala/xml/persistent/CachedFileStorage.scala @@ -8,7 +8,8 @@ // $Id$ -package scala.xml.persistent +package scala.xml +package persistent import java.io.{File, FileOutputStream} import java.nio.ByteBuffer diff --git a/src/library/scala/xml/persistent/Index.scala b/src/library/scala/xml/persistent/Index.scala index 753bd964b0..b9d9debb7b 100644 --- a/src/library/scala/xml/persistent/Index.scala +++ b/src/library/scala/xml/persistent/Index.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.persistent +package scala.xml +package persistent /** an Index returns some unique key that is part of a node */ diff --git a/src/library/scala/xml/persistent/IndexedStorage.scala b/src/library/scala/xml/persistent/IndexedStorage.scala index 979a048b63..0f1200b76c 100644 --- a/src/library/scala/xml/persistent/IndexedStorage.scala +++ b/src/library/scala/xml/persistent/IndexedStorage.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.persistent +package scala.xml +package persistent import scala.collection.mutable import java.io.File diff --git a/src/library/scala/xml/persistent/SetStorage.scala b/src/library/scala/xml/persistent/SetStorage.scala index 90c59f80c3..b30e0ee080 100644 --- a/src/library/scala/xml/persistent/SetStorage.scala +++ b/src/library/scala/xml/persistent/SetStorage.scala @@ -8,7 +8,8 @@ // $Id$ -package scala.xml.persistent +package scala.xml +package persistent import scala.collection.mutable import java.io.File diff --git a/src/library/scala/xml/pull/XMLEvent.scala b/src/library/scala/xml/pull/XMLEvent.scala index e0956aae86..a2177d61c9 100644 --- a/src/library/scala/xml/pull/XMLEvent.scala +++ b/src/library/scala/xml/pull/XMLEvent.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.pull +package scala.xml +package pull /** This class represents an XML event for pull parsing. * Pull parsing means that during the traversal of the XML diff --git a/src/library/scala/xml/pull/XMLEventReader.scala b/src/library/scala/xml/pull/XMLEventReader.scala index dfb6ac4049..c32bd81f4b 100644 --- a/src/library/scala/xml/pull/XMLEventReader.scala +++ b/src/library/scala/xml/pull/XMLEventReader.scala @@ -8,7 +8,8 @@ // $Id$ -package scala.xml.pull +package scala.xml +package pull import java.util.concurrent.LinkedBlockingQueue import java.nio.channels.ClosedChannelException diff --git a/src/library/scala/xml/transform/BasicTransformer.scala b/src/library/scala/xml/transform/BasicTransformer.scala index 90e248019d..917884617c 100644 --- a/src/library/scala/xml/transform/BasicTransformer.scala +++ b/src/library/scala/xml/transform/BasicTransformer.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.transform +package scala.xml +package transform /** A class for XML transformations. * diff --git a/src/library/scala/xml/transform/RewriteRule.scala b/src/library/scala/xml/transform/RewriteRule.scala index 88de32599e..d2712f4552 100644 --- a/src/library/scala/xml/transform/RewriteRule.scala +++ b/src/library/scala/xml/transform/RewriteRule.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.transform +package scala.xml +package transform /** a RewriteRule, when applied to a term, yields either * the resulting of rewriting or the term itself it the rule diff --git a/src/library/scala/xml/transform/RuleTransformer.scala b/src/library/scala/xml/transform/RuleTransformer.scala index 52049115d5..7275c562ba 100644 --- a/src/library/scala/xml/transform/RuleTransformer.scala +++ b/src/library/scala/xml/transform/RuleTransformer.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.xml.transform +package scala.xml +package transform class RuleTransformer(rules: RewriteRule*) extends BasicTransformer { override def transform(n: Node): Seq[Node] = diff --git a/src/partest/scala/tools/partest/nest/AntRunner.scala b/src/partest/scala/tools/partest/nest/AntRunner.scala index 9939a6b0c3..62bc4af75f 100644 --- a/src/partest/scala/tools/partest/nest/AntRunner.scala +++ b/src/partest/scala/tools/partest/nest/AntRunner.scala @@ -8,7 +8,8 @@ // $Id$ -package scala.tools.partest.nest +package scala.tools.partest +package nest import java.io.File diff --git a/src/partest/scala/tools/partest/nest/CompileManager.scala b/src/partest/scala/tools/partest/nest/CompileManager.scala index 0e48d58b8b..993771bcdc 100644 --- a/src/partest/scala/tools/partest/nest/CompileManager.scala +++ b/src/partest/scala/tools/partest/nest/CompileManager.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.partest.nest +package scala.tools.partest +package nest import scala.tools.nsc.{Global, Settings, CompilerCommand, FatalError} import scala.tools.nsc.reporters.{Reporter, ConsoleReporter} diff --git a/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala b/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala index e33e12af4c..33bcb11b70 100644 --- a/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala +++ b/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.partest.nest +package scala.tools.partest +package nest import java.io.{File, FilenameFilter, IOException, StringWriter} import java.net.URI diff --git a/src/partest/scala/tools/partest/nest/ConsoleRunner.scala b/src/partest/scala/tools/partest/nest/ConsoleRunner.scala index c353ea6f06..1bce0fe792 100644 --- a/src/partest/scala/tools/partest/nest/ConsoleRunner.scala +++ b/src/partest/scala/tools/partest/nest/ConsoleRunner.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.partest.nest +package scala.tools.partest +package nest import java.io.{File, PrintStream, FileOutputStream, BufferedReader, InputStreamReader, StringWriter, PrintWriter} @@ -131,7 +132,7 @@ class ConsoleRunner extends DirectRunner with RunnerUtils { fileManager.latestCompFile.getParentFile.getParentFile.getCanonicalFile NestUI.outline("Scala compiler classes in: "+dir+"\n") - NestUI.outline("Scala version is: "+nsc.Properties.versionMsg+"\n") + NestUI.outline("Scala version is: "+scala.tools.nsc.Properties.versionMsg+"\n") NestUI.outline("Scalac options are: "+fileManager.SCALAC_OPTS+"\n") val vmBin = javaHome + File.separator + "bin" diff --git a/src/partest/scala/tools/partest/nest/DirectRunner.scala b/src/partest/scala/tools/partest/nest/DirectRunner.scala index 7a610869a1..ba3c2439a5 100644 --- a/src/partest/scala/tools/partest/nest/DirectRunner.scala +++ b/src/partest/scala/tools/partest/nest/DirectRunner.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.partest.nest +package scala.tools.partest +package nest import java.io.{File, PrintStream, FileOutputStream, BufferedReader, InputStreamReader, StringWriter, PrintWriter} diff --git a/src/partest/scala/tools/partest/nest/FileManager.scala b/src/partest/scala/tools/partest/nest/FileManager.scala index 9c87e7ed6d..bdce6c8439 100644 --- a/src/partest/scala/tools/partest/nest/FileManager.scala +++ b/src/partest/scala/tools/partest/nest/FileManager.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.partest.nest +package scala.tools.partest +package nest import java.io.{File, FilenameFilter, IOException, StringWriter} import java.net.URI diff --git a/src/partest/scala/tools/partest/nest/NestRunner.scala b/src/partest/scala/tools/partest/nest/NestRunner.scala index 2b1115455c..9275c1c668 100644 --- a/src/partest/scala/tools/partest/nest/NestRunner.scala +++ b/src/partest/scala/tools/partest/nest/NestRunner.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.partest.nest +package scala.tools.partest +package nest object NestRunner { def main(args: Array[String]) { diff --git a/src/partest/scala/tools/partest/nest/NestUI.scala b/src/partest/scala/tools/partest/nest/NestUI.scala index ad9111d3a9..115582f7b9 100644 --- a/src/partest/scala/tools/partest/nest/NestUI.scala +++ b/src/partest/scala/tools/partest/nest/NestUI.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.partest.nest +package scala.tools.partest +package nest import java.io.PrintWriter diff --git a/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala b/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala index 2c5493f9e1..5e9b9af0c1 100644 --- a/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala +++ b/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.partest.nest +package scala.tools.partest +package nest /* This class is used to load an instance of DirectRunner using * a custom class loader. diff --git a/src/partest/scala/tools/partest/nest/RunnerUtils.scala b/src/partest/scala/tools/partest/nest/RunnerUtils.scala index 12d0fcd217..2743da7bc5 100644 --- a/src/partest/scala/tools/partest/nest/RunnerUtils.scala +++ b/src/partest/scala/tools/partest/nest/RunnerUtils.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.partest.nest +package scala.tools.partest +package nest trait RunnerUtils { diff --git a/src/partest/scala/tools/partest/nest/StreamAppender.scala b/src/partest/scala/tools/partest/nest/StreamAppender.scala index 4ae7cbda27..1dc4ec1dd2 100644 --- a/src/partest/scala/tools/partest/nest/StreamAppender.scala +++ b/src/partest/scala/tools/partest/nest/StreamAppender.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.partest.nest +package scala.tools.partest +package nest import java.io.{Writer, PrintWriter, Reader, BufferedReader, IOException, InputStream, StringWriter, InputStreamReader, diff --git a/src/partest/scala/tools/partest/nest/TestFile.scala b/src/partest/scala/tools/partest/nest/TestFile.scala index d7ec9c64cf..b8223a9202 100644 --- a/src/partest/scala/tools/partest/nest/TestFile.scala +++ b/src/partest/scala/tools/partest/nest/TestFile.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.partest.nest +package scala.tools.partest +package nest import java.io.{File, BufferedReader, FileReader} import scala.tools.nsc.Settings diff --git a/src/partest/scala/tools/partest/nest/Worker.scala b/src/partest/scala/tools/partest/nest/Worker.scala index 0ecd9986f3..bb51a5049b 100644 --- a/src/partest/scala/tools/partest/nest/Worker.scala +++ b/src/partest/scala/tools/partest/nest/Worker.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.partest.nest +package scala.tools.partest +package nest import java.io._ import java.net.{URLClassLoader, URL} @@ -15,7 +16,7 @@ import scala.tools.nsc.{ObjectRunner, GenericRunnerCommand} import scala.actors.{Actor, Exit, TIMEOUT} import scala.actors.Actor._ -import scalap.scalax.rules.scalasig.{ByteCode, ClassFileParser, ScalaSigAttributeParsers} +import scala.tools.scalap.scalax.rules.scalasig.{ByteCode, ClassFileParser, ScalaSigAttributeParsers} case class RunTests(kind: String, files: List[File]) case class Results(succ: Int, fail: Int, logs: List[LogFile], outdirs: List[File]) diff --git a/src/partest/scala/tools/partest/utils/PrintMgr.scala b/src/partest/scala/tools/partest/utils/PrintMgr.scala index dae6ac448e..2927605160 100644 --- a/src/partest/scala/tools/partest/utils/PrintMgr.scala +++ b/src/partest/scala/tools/partest/utils/PrintMgr.scala @@ -8,7 +8,8 @@ // $Id$ -package scala.tools.partest.utils +package scala.tools.partest +package utils /** * @author Thomas Hofer diff --git a/src/partest/scala/tools/partest/utils/Properties.scala b/src/partest/scala/tools/partest/utils/Properties.scala index d5fc60db65..b2c9ce3408 100644 --- a/src/partest/scala/tools/partest/utils/Properties.scala +++ b/src/partest/scala/tools/partest/utils/Properties.scala @@ -8,10 +8,11 @@ // $Id$ -package scala.tools.partest.utils +package scala.tools.partest +package utils /** Loads partest.properties from the jar. */ object Properties extends scala.util.PropertiesTrait { protected def propCategory = "partest" protected def pickJarBasedOn = classOf[Application] -}
\ No newline at end of file +} diff --git a/src/scalap/scala/tools/scalap/Properties.scala b/src/scalap/scala/tools/scalap/Properties.scala index 05452c448e..5329c0398b 100644 --- a/src/scalap/scala/tools/scalap/Properties.scala +++ b/src/scalap/scala/tools/scalap/Properties.scala @@ -14,5 +14,5 @@ object Properties extends scala.util.PropertiesTrait { protected def propCategory = "decoder" protected def pickJarBasedOn = classOf[Classfile] - val cmdName = nsc.Properties.cmdName -}
\ No newline at end of file + val cmdName = scala.tools.nsc.Properties.cmdName +} diff --git a/src/scalap/scala/tools/scalap/scalax/rules/Arrows.scala b/src/scalap/scala/tools/scalap/scalax/rules/Arrows.scala index 2bc2cf5380..f8761ca0ed 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/Arrows.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/Arrows.scala @@ -1,4 +1,6 @@ -package scala.tools.scalap.scalax.rules +package scala.tools.scalap +package scalax +package rules trait Arrows extends UnitFunctors { type Arr[-A, +B] <: Arrow[A, B] diff --git a/src/scalap/scala/tools/scalap/scalax/rules/Functors.scala b/src/scalap/scala/tools/scalap/scalax/rules/Functors.scala index b9de5c71da..aa95b48d44 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/Functors.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/Functors.scala @@ -10,7 +10,9 @@ // // ----------------------------------------------------------------------------- -package scala.tools.scalap.scalax.rules +package scala.tools.scalap +package scalax +package rules trait Functor[+A] { type M[+A] <: Functor[A] diff --git a/src/scalap/scala/tools/scalap/scalax/rules/Input.scala b/src/scalap/scala/tools/scalap/scalax/rules/Input.scala index c01f1d88c9..370eb0d054 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/Input.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/Input.scala @@ -10,7 +10,9 @@ // // ----------------------------------------------------------------------------- -package scala.tools.scalap.scalax.rules +package scala.tools.scalap +package scalax +package rules trait Input[+A] extends Iterable[A] { diff --git a/src/scalap/scala/tools/scalap/scalax/rules/Memoisable.scala b/src/scalap/scala/tools/scalap/scalax/rules/Memoisable.scala index 0bcae2bded..1324ea695a 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/Memoisable.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/Memoisable.scala @@ -10,7 +10,9 @@ // // ----------------------------------------------------------------------------- -package scala.tools.scalap.scalax.rules +package scala.tools.scalap +package scalax +package rules import scala.collection.mutable.HashMap diff --git a/src/scalap/scala/tools/scalap/scalax/rules/Monad.scala b/src/scalap/scala/tools/scalap/scalax/rules/Monad.scala index 1b03b5d3fa..639c414675 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/Monad.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/Monad.scala @@ -10,7 +10,9 @@ // // ----------------------------------------------------------------------------- -package scala.tools.scalap.scalax.rules +package scala.tools.scalap +package scalax +package rules trait Monad[+A] extends Functor[A] { type M[+A] <: Monad[A] diff --git a/src/scalap/scala/tools/scalap/scalax/rules/Result.scala b/src/scalap/scala/tools/scalap/scalax/rules/Result.scala index cb8ec4b290..6befbb83c8 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/Result.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/Result.scala @@ -10,7 +10,9 @@ // // ----------------------------------------------------------------------------- -package scala.tools.scalap.scalax.rules; +package scala.tools.scalap +package scalax +package rules; /** Represents the combined value of two rules applied in sequence. * diff --git a/src/scalap/scala/tools/scalap/scalax/rules/Rule.scala b/src/scalap/scala/tools/scalap/scalax/rules/Rule.scala index f540d9ad8d..1500b81050 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/Rule.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/Rule.scala @@ -10,7 +10,9 @@ // // ----------------------------------------------------------------------------- -package scala.tools.scalap.scalax.rules +package scala.tools.scalap +package scalax +package rules /** A Rule is a function from some input to a Result. The result may be: * <ul> diff --git a/src/scalap/scala/tools/scalap/scalax/rules/Rules.scala b/src/scalap/scala/tools/scalap/scalax/rules/Rules.scala index fa6f959384..4e8ddc8dbe 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/Rules.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/Rules.scala @@ -10,7 +10,9 @@ // // ----------------------------------------------------------------------------- -package scala.tools.scalap.scalax.rules +package scala.tools.scalap +package scalax +package rules trait Name { def name : String diff --git a/src/scalap/scala/tools/scalap/scalax/rules/SeqRule.scala b/src/scalap/scala/tools/scalap/scalax/rules/SeqRule.scala index d32300f832..6b36721c50 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/SeqRule.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/SeqRule.scala @@ -10,7 +10,9 @@ // // ----------------------------------------------------------------------------- -package scala.tools.scalap.scalax.rules +package scala.tools.scalap +package scalax +package rules /** * A workaround for the difficulties of dealing with diff --git a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ClassFileParser.scala b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ClassFileParser.scala index 5b90cf9e58..182054c01b 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ClassFileParser.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ClassFileParser.scala @@ -1,4 +1,7 @@ -package scala.tools.scalap.scalax.rules.scalasig +package scala.tools.scalap +package scalax +package rules +package scalasig import java.io.IOException diff --git a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/Flags.scala b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/Flags.scala index c567cdf715..8027f0c4c1 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/Flags.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/Flags.scala @@ -1,4 +1,7 @@ -package scala.tools.scalap.scalax.rules.scalasig +package scala.tools.scalap +package scalax +package rules +package scalasig trait Flags { def hasFlag(flag : Long) : Boolean diff --git a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSig.scala b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSig.scala index ad29ac0701..146fc5ce05 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSig.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSig.scala @@ -1,4 +1,7 @@ -package scala.tools.scalap.scalax.rules.scalasig +package scala.tools.scalap +package scalax +package rules +package scalasig object ScalaSigParser { @@ -320,4 +323,4 @@ object ScalaSigEntryParsers extends RulesWithState with MemoisableRules { * ConstAnnotArg = Constant | AnnotInfo | AnnotArgArray * * len is remaining length after `len'. - */
\ No newline at end of file + */ diff --git a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSigPrinter.scala b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSigPrinter.scala index f3e395ae75..7177f1c3a4 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSigPrinter.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSigPrinter.scala @@ -7,7 +7,10 @@ // $Id$ -package scala.tools.scalap.scalax.rules.scalasig +package scala.tools.scalap +package scalax +package rules +package scalasig import java.io.{PrintStream, ByteArrayOutputStream} import java.util.regex.Pattern diff --git a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/SourceFileAttributeParser.scala b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/SourceFileAttributeParser.scala index f02ca870b0..fc5a75c046 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/SourceFileAttributeParser.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/SourceFileAttributeParser.scala @@ -1,4 +1,7 @@ -package scala.tools.scalap.scalax.rules.scalasig +package scala.tools.scalap +package scalax +package rules +package scalasig /** * @author ilyas diff --git a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/Symbol.scala b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/Symbol.scala index f8c5e88db1..47fb39ae0f 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/Symbol.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/Symbol.scala @@ -1,4 +1,7 @@ -package scala.tools.scalap.scalax.rules.scalasig +package scala.tools.scalap +package scalax +package rules +package scalasig import ScalaSigEntryParsers._ diff --git a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/Type.scala b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/Type.scala index f6986b28b7..e224525d06 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/Type.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/Type.scala @@ -1,4 +1,7 @@ -package scala.tools.scalap.scalax.rules.scalasig +package scala.tools.scalap +package scalax +package rules +package scalasig abstract class Type @@ -19,4 +22,4 @@ case class ImplicitMethodType(resultType : Type, paramSymbols : Seq[Symbol]) ext case class AnnotatedType(typeRef : Type, attribTreeRefs : List[Int]) extends Type case class AnnotatedWithSelfType(typeRef : Type, symbol : Symbol, attribTreeRefs : List[Int]) extends Type case class DeBruijnIndexType(typeLevel : Int, typeIndex : Int) extends Type -case class ExistentialType(typeRef : Type, symbols : Seq[Symbol]) extends Type
\ No newline at end of file +case class ExistentialType(typeRef : Type, symbols : Seq[Symbol]) extends Type diff --git a/src/scalap/scala/tools/scalap/scalax/util/StringUtil.scala b/src/scalap/scala/tools/scalap/scalax/util/StringUtil.scala index 7986763b7b..6077eded0f 100644 --- a/src/scalap/scala/tools/scalap/scalax/util/StringUtil.scala +++ b/src/scalap/scala/tools/scalap/scalax/util/StringUtil.scala @@ -1,4 +1,6 @@ -package scala.tools.scalap.scalax.util +package scala.tools.scalap +package scalax +package util import java.beans.Introspector @@ -14,4 +16,4 @@ object StringUtil { def cutSubstring(dom: String)(s: String) = if (dom != null && s != null) dom.replace(s, "") else dom -}
\ No newline at end of file +} diff --git a/src/swing/scala/swing/event/ActionEvent.scala b/src/swing/scala/swing/event/ActionEvent.scala index e451d4ee39..357b78be70 100644 --- a/src/swing/scala/swing/event/ActionEvent.scala +++ b/src/swing/scala/swing/event/ActionEvent.scala @@ -9,6 +9,7 @@ // $Id$ -package scala.swing.event +package scala.swing +package event case class ActionEvent(override val source: Component) extends ComponentEvent diff --git a/src/swing/scala/swing/event/AdjustingEvent.scala b/src/swing/scala/swing/event/AdjustingEvent.scala index 2c8714dc13..3867f9ed79 100644 --- a/src/swing/scala/swing/event/AdjustingEvent.scala +++ b/src/swing/scala/swing/event/AdjustingEvent.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.swing.event +package scala.swing +package event /** <p> * An event that indicates some editing operation that can be still in diff --git a/src/swing/scala/swing/event/BackgroundChanged.scala b/src/swing/scala/swing/event/BackgroundChanged.scala index 046e8a0269..6eac04a655 100644 --- a/src/swing/scala/swing/event/BackgroundChanged.scala +++ b/src/swing/scala/swing/event/BackgroundChanged.scala @@ -9,6 +9,7 @@ // $Id$ -package scala.swing.event +package scala.swing +package event case class BackgroundChanged(override val source: Component) extends ComponentEvent diff --git a/src/swing/scala/swing/event/ButtonClicked.scala b/src/swing/scala/swing/event/ButtonClicked.scala index 591cba0ed6..578ab41876 100644 --- a/src/swing/scala/swing/event/ButtonClicked.scala +++ b/src/swing/scala/swing/event/ButtonClicked.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.swing.event +package scala.swing +package event case class ButtonClicked(override val source: AbstractButton) extends ActionEvent(source) diff --git a/src/swing/scala/swing/event/CaretUpdate.scala b/src/swing/scala/swing/event/CaretUpdate.scala index 3f8bf8ff4f..c476049781 100644 --- a/src/swing/scala/swing/event/CaretUpdate.scala +++ b/src/swing/scala/swing/event/CaretUpdate.scala @@ -9,6 +9,7 @@ // $Id$ -package scala.swing.event +package scala.swing +package event case class CaretUpdate(override val source: TextComponent) extends ComponentEvent diff --git a/src/swing/scala/swing/event/ComponentEvent.scala b/src/swing/scala/swing/event/ComponentEvent.scala index a3b0c6f98a..0ee06228ab 100644 --- a/src/swing/scala/swing/event/ComponentEvent.scala +++ b/src/swing/scala/swing/event/ComponentEvent.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.swing.event +package scala.swing +package event trait ComponentEvent extends UIEvent { override val source: Component diff --git a/src/swing/scala/swing/event/ContainerEvent.scala b/src/swing/scala/swing/event/ContainerEvent.scala index 39ff292962..9f2bb837c3 100644 --- a/src/swing/scala/swing/event/ContainerEvent.scala +++ b/src/swing/scala/swing/event/ContainerEvent.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.swing.event +package scala.swing +package event abstract class ContainerEvent(override val source: Container) extends UIEvent diff --git a/src/swing/scala/swing/event/EditDone.scala b/src/swing/scala/swing/event/EditDone.scala index b92b5e6203..9d648214e9 100644 --- a/src/swing/scala/swing/event/EditDone.scala +++ b/src/swing/scala/swing/event/EditDone.scala @@ -9,6 +9,7 @@ // $Id$ -package scala.swing.event +package scala.swing +package event case class EditDone(override val source: TextField) extends ValueChanged(source) diff --git a/src/swing/scala/swing/event/Event.scala b/src/swing/scala/swing/event/Event.scala index 1d610acbf6..443351cc65 100644 --- a/src/swing/scala/swing/event/Event.scala +++ b/src/swing/scala/swing/event/Event.scala @@ -9,6 +9,7 @@ // $Id$ -package scala.swing.event +package scala.swing +package event trait Event diff --git a/src/swing/scala/swing/event/FocusEvent.scala b/src/swing/scala/swing/event/FocusEvent.scala index 995a5effa3..7c60490656 100644 --- a/src/swing/scala/swing/event/FocusEvent.scala +++ b/src/swing/scala/swing/event/FocusEvent.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.swing.event +package scala.swing +package event /** * The other component is None if it is a non Swing, i.e., AWT or native, component. diff --git a/src/swing/scala/swing/event/FontChanged.scala b/src/swing/scala/swing/event/FontChanged.scala index 6535cec052..b2202627a8 100644 --- a/src/swing/scala/swing/event/FontChanged.scala +++ b/src/swing/scala/swing/event/FontChanged.scala @@ -9,6 +9,7 @@ // $Id$ -package scala.swing.event +package scala.swing +package event case class FontChanged(override val source: Component) extends ComponentEvent diff --git a/src/swing/scala/swing/event/ForegroundChanged.scala b/src/swing/scala/swing/event/ForegroundChanged.scala index 39486562dc..5091c0fc85 100644 --- a/src/swing/scala/swing/event/ForegroundChanged.scala +++ b/src/swing/scala/swing/event/ForegroundChanged.scala @@ -9,6 +9,7 @@ // $Id$ -package scala.swing.event +package scala.swing +package event case class ForegroundChanged(override val source: Component) extends ComponentEvent diff --git a/src/swing/scala/swing/event/InputEvent.scala b/src/swing/scala/swing/event/InputEvent.scala index 561518a9a1..8030be38cd 100644 --- a/src/swing/scala/swing/event/InputEvent.scala +++ b/src/swing/scala/swing/event/InputEvent.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.swing.event +package scala.swing +package event trait InputEvent extends ComponentEvent { def peer: java.awt.event.InputEvent diff --git a/src/swing/scala/swing/event/Key.scala b/src/swing/scala/swing/event/Key.scala index c2e8ef3515..dfe5e89111 100644 --- a/src/swing/scala/swing/event/Key.scala +++ b/src/swing/scala/swing/event/Key.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.swing.event +package scala.swing +package event /** * Enumeration of key codes used by key events. diff --git a/src/swing/scala/swing/event/KeyEvent.scala b/src/swing/scala/swing/event/KeyEvent.scala index 5745a4f7d1..277731bb59 100644 --- a/src/swing/scala/swing/event/KeyEvent.scala +++ b/src/swing/scala/swing/event/KeyEvent.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.swing.event +package scala.swing +package event import javax.swing.JComponent diff --git a/src/swing/scala/swing/event/ListEvent.scala b/src/swing/scala/swing/event/ListEvent.scala index 86c62708f2..7a35f95011 100644 --- a/src/swing/scala/swing/event/ListEvent.scala +++ b/src/swing/scala/swing/event/ListEvent.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.swing.event +package scala.swing +package event trait ListEvent[A] extends ComponentEvent { override val source: ListView[A] diff --git a/src/swing/scala/swing/event/MouseEvent.scala b/src/swing/scala/swing/event/MouseEvent.scala index a41e5a92ae..44201c194f 100644 --- a/src/swing/scala/swing/event/MouseEvent.scala +++ b/src/swing/scala/swing/event/MouseEvent.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.swing.event +package scala.swing +package event import java.awt.Point import javax.swing.JComponent diff --git a/src/swing/scala/swing/event/SelectionEvent.scala b/src/swing/scala/swing/event/SelectionEvent.scala index 48ee31b4ed..c5aad07f7f 100644 --- a/src/swing/scala/swing/event/SelectionEvent.scala +++ b/src/swing/scala/swing/event/SelectionEvent.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.swing.event +package scala.swing +package event /** * An event that indicates a change in a selection such as in a list view or a table. diff --git a/src/swing/scala/swing/event/TableEvent.scala b/src/swing/scala/swing/event/TableEvent.scala index b3e95ee751..3c684c483f 100644 --- a/src/swing/scala/swing/event/TableEvent.scala +++ b/src/swing/scala/swing/event/TableEvent.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.swing.event +package scala.swing +package event abstract class TableEvent(override val source: Table) extends ComponentEvent diff --git a/src/swing/scala/swing/event/UIEvent.scala b/src/swing/scala/swing/event/UIEvent.scala index 0669d63bec..f4764b6c76 100644 --- a/src/swing/scala/swing/event/UIEvent.scala +++ b/src/swing/scala/swing/event/UIEvent.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.swing.event +package scala.swing +package event trait UIEvent extends Event { val source: UIElement diff --git a/src/swing/scala/swing/event/ValueChanged.scala b/src/swing/scala/swing/event/ValueChanged.scala index dda1a6d2aa..0c6689eeef 100644 --- a/src/swing/scala/swing/event/ValueChanged.scala +++ b/src/swing/scala/swing/event/ValueChanged.scala @@ -9,6 +9,7 @@ // $Id$ -package scala.swing.event +package scala.swing +package event case class ValueChanged(override val source: Component) extends ComponentEvent diff --git a/src/swing/scala/swing/event/WindowActivated.scala b/src/swing/scala/swing/event/WindowActivated.scala index 0b45a4fc00..e00de4dda3 100644 --- a/src/swing/scala/swing/event/WindowActivated.scala +++ b/src/swing/scala/swing/event/WindowActivated.scala @@ -9,6 +9,7 @@ // $Id$ -package scala.swing.event +package scala.swing +package event case class WindowActivated(override val source: Window) extends WindowEvent(source) diff --git a/src/swing/scala/swing/event/WindowClosed.scala b/src/swing/scala/swing/event/WindowClosed.scala index 3f5f9a33e2..80afe1a99f 100644 --- a/src/swing/scala/swing/event/WindowClosed.scala +++ b/src/swing/scala/swing/event/WindowClosed.scala @@ -1,3 +1,4 @@ -package scala.swing.event +package scala.swing +package event case class WindowClosed(override val source: Window) extends WindowEvent(source) diff --git a/src/swing/scala/swing/event/WindowClosing.scala b/src/swing/scala/swing/event/WindowClosing.scala index eeb6819540..39347542a8 100644 --- a/src/swing/scala/swing/event/WindowClosing.scala +++ b/src/swing/scala/swing/event/WindowClosing.scala @@ -9,6 +9,7 @@ // $Id$ -package scala.swing.event +package scala.swing +package event case class WindowClosing(override val source: Window) extends WindowEvent(source) diff --git a/src/swing/scala/swing/event/WindowDeactivated.scala b/src/swing/scala/swing/event/WindowDeactivated.scala index cd8f22bb2a..cd5b03b785 100644 --- a/src/swing/scala/swing/event/WindowDeactivated.scala +++ b/src/swing/scala/swing/event/WindowDeactivated.scala @@ -9,6 +9,7 @@ // $Id$ -package scala.swing.event +package scala.swing +package event case class WindowDeactivated(override val source: Window) extends WindowEvent(source) diff --git a/src/swing/scala/swing/event/WindowDeiconified.scala b/src/swing/scala/swing/event/WindowDeiconified.scala index 90f10e0750..5dfeb1e22b 100644 --- a/src/swing/scala/swing/event/WindowDeiconified.scala +++ b/src/swing/scala/swing/event/WindowDeiconified.scala @@ -9,6 +9,7 @@ // $Id$ -package scala.swing.event +package scala.swing +package event case class WindowDeiconified(override val source: Window) extends WindowEvent(source) diff --git a/src/swing/scala/swing/event/WindowEvent.scala b/src/swing/scala/swing/event/WindowEvent.scala index 801ab7dca4..11eb19d238 100644 --- a/src/swing/scala/swing/event/WindowEvent.scala +++ b/src/swing/scala/swing/event/WindowEvent.scala @@ -9,6 +9,7 @@ // $Id$ -package scala.swing.event +package scala.swing +package event abstract class WindowEvent(override val source: Window) extends UIEvent diff --git a/src/swing/scala/swing/event/WindowIconified.scala b/src/swing/scala/swing/event/WindowIconified.scala index dc7b5ab513..52c80caa6a 100644 --- a/src/swing/scala/swing/event/WindowIconified.scala +++ b/src/swing/scala/swing/event/WindowIconified.scala @@ -9,6 +9,7 @@ // $Id$ -package scala.swing.event +package scala.swing +package event case class WindowIconified(override val source: Window) extends WindowEvent(source) diff --git a/src/swing/scala/swing/event/WindowOpened.scala b/src/swing/scala/swing/event/WindowOpened.scala index 2a9eb162c4..95029fb63d 100644 --- a/src/swing/scala/swing/event/WindowOpened.scala +++ b/src/swing/scala/swing/event/WindowOpened.scala @@ -9,6 +9,7 @@ // $Id$ -package scala.swing.event +package scala.swing +package event case class WindowOpened(override val source: Window) extends WindowEvent(source) diff --git a/src/swing/scala/swing/model/Matrix.scala b/src/swing/scala/swing/model/Matrix.scala index 975d880a5a..1de8cfbf6e 100644 --- a/src/swing/scala/swing/model/Matrix.scala +++ b/src/swing/scala/swing/model/Matrix.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.swing.model +package scala.swing +package model /*trait Matrix[A] extends Function2[Int, Int, A] { diff --git a/src/swing/scala/swing/test/ButtonApp.scala b/src/swing/scala/swing/test/ButtonApp.scala index 855b094d77..163da63612 100755 --- a/src/swing/scala/swing/test/ButtonApp.scala +++ b/src/swing/scala/swing/test/ButtonApp.scala @@ -1,4 +1,5 @@ -package scala.swing.test +package scala.swing +package test import java.awt.Dimension diff --git a/src/swing/scala/swing/test/CelsiusConverter.scala b/src/swing/scala/swing/test/CelsiusConverter.scala index fc5c1e4553..00a65e2a65 100644 --- a/src/swing/scala/swing/test/CelsiusConverter.scala +++ b/src/swing/scala/swing/test/CelsiusConverter.scala @@ -1,4 +1,5 @@ -package scala.swing.test +package scala.swing +package test import swing._ import event._ diff --git a/src/swing/scala/swing/test/CelsiusConverter2.scala b/src/swing/scala/swing/test/CelsiusConverter2.scala index 96565d78c1..9ec0550f66 100644 --- a/src/swing/scala/swing/test/CelsiusConverter2.scala +++ b/src/swing/scala/swing/test/CelsiusConverter2.scala @@ -1,4 +1,5 @@ -package scala.swing.test +package scala.swing +package test import swing._ import event._ diff --git a/src/swing/scala/swing/test/ComboBoxes.scala b/src/swing/scala/swing/test/ComboBoxes.scala index 1dcdad4238..1241955304 100644 --- a/src/swing/scala/swing/test/ComboBoxes.scala +++ b/src/swing/scala/swing/test/ComboBoxes.scala @@ -1,4 +1,5 @@ -package scala.swing.test +package scala.swing +package test import swing._ import event._ diff --git a/src/swing/scala/swing/test/CountButton.scala b/src/swing/scala/swing/test/CountButton.scala index d211bbe15e..88464def2c 100644 --- a/src/swing/scala/swing/test/CountButton.scala +++ b/src/swing/scala/swing/test/CountButton.scala @@ -1,4 +1,5 @@ -package scala.swing.test +package scala.swing +package test import scala.swing._ import scala.swing.event._ diff --git a/src/swing/scala/swing/test/Dialogs.scala b/src/swing/scala/swing/test/Dialogs.scala index 601c78e71d..f9a7ad4c88 100644 --- a/src/swing/scala/swing/test/Dialogs.scala +++ b/src/swing/scala/swing/test/Dialogs.scala @@ -1,4 +1,5 @@ -package scala.swing.test +package scala.swing +package test import swing._ import swing.event._ diff --git a/src/swing/scala/swing/test/GridBagDemo.scala b/src/swing/scala/swing/test/GridBagDemo.scala index 2b6b6b73ad..8f05ddacc2 100644 --- a/src/swing/scala/swing/test/GridBagDemo.scala +++ b/src/swing/scala/swing/test/GridBagDemo.scala @@ -1,4 +1,5 @@ -package scala.swing.test +package scala.swing +package test import swing._ import swing.event._ diff --git a/src/swing/scala/swing/test/HelloWorld.scala b/src/swing/scala/swing/test/HelloWorld.scala index d4219f72ca..c1bad84782 100644 --- a/src/swing/scala/swing/test/HelloWorld.scala +++ b/src/swing/scala/swing/test/HelloWorld.scala @@ -1,4 +1,5 @@ -package scala.swing.test +package scala.swing +package test import swing._ diff --git a/src/swing/scala/swing/test/LabelTest.scala b/src/swing/scala/swing/test/LabelTest.scala index f4702aa6d0..d2c9745c94 100644 --- a/src/swing/scala/swing/test/LabelTest.scala +++ b/src/swing/scala/swing/test/LabelTest.scala @@ -1,4 +1,5 @@ -package scala.swing.test +package scala.swing +package test import scala.swing._ import scala.swing.event._ diff --git a/src/swing/scala/swing/test/LinePainting.scala b/src/swing/scala/swing/test/LinePainting.scala index fdccb226a7..a5f8475c99 100644 --- a/src/swing/scala/swing/test/LinePainting.scala +++ b/src/swing/scala/swing/test/LinePainting.scala @@ -1,4 +1,5 @@ -package scala.swing.test +package scala.swing +package test import scala.swing.Swing._ import scala.swing.{MainFrame, Panel, SimpleGUIApplication} import scala.swing.event._ @@ -49,4 +50,4 @@ object LinePainting extends SimpleGUIApplication { title = "Simple Line Painting Demo" contents = ui } -}
\ No newline at end of file +} diff --git a/src/swing/scala/swing/test/SimpleApplet.scala b/src/swing/scala/swing/test/SimpleApplet.scala index 3382e5c2e8..090f4cde8d 100644 --- a/src/swing/scala/swing/test/SimpleApplet.scala +++ b/src/swing/scala/swing/test/SimpleApplet.scala @@ -1,4 +1,5 @@ -package scala.swing.test +package scala.swing +package test import event._ diff --git a/src/swing/scala/swing/test/SwingApp.scala b/src/swing/scala/swing/test/SwingApp.scala index b6f4e53771..fe14360ef4 100644 --- a/src/swing/scala/swing/test/SwingApp.scala +++ b/src/swing/scala/swing/test/SwingApp.scala @@ -1,4 +1,5 @@ -package scala.swing.test +package scala.swing +package test import swing._ import swing.event._ diff --git a/src/swing/scala/swing/test/TableSelection.scala b/src/swing/scala/swing/test/TableSelection.scala index 828f772085..75a07876a6 100644 --- a/src/swing/scala/swing/test/TableSelection.scala +++ b/src/swing/scala/swing/test/TableSelection.scala @@ -1,4 +1,5 @@ -package scala.swing.test +package scala.swing +package test import java.awt.Dimension import swing._ @@ -94,4 +95,4 @@ object TableSelection extends SimpleGUIApplication { title = "Table Selection" contents = ui } -}
\ No newline at end of file +} diff --git a/src/swing/scala/swing/test/UIDemo.scala b/src/swing/scala/swing/test/UIDemo.scala index 5382db8281..072fe0ecd2 100644 --- a/src/swing/scala/swing/test/UIDemo.scala +++ b/src/swing/scala/swing/test/UIDemo.scala @@ -1,4 +1,5 @@ -package scala.swing.test +package scala.swing +package test import swing._ import event._ |