diff options
18 files changed, 28 insertions, 28 deletions
diff --git a/src/compiler/scala/tools/nsc/CompilationUnits.scala b/src/compiler/scala/tools/nsc/CompilationUnits.scala index a593538852..60799c3c37 100644 --- a/src/compiler/scala/tools/nsc/CompilationUnits.scala +++ b/src/compiler/scala/tools/nsc/CompilationUnits.scala @@ -3,11 +3,12 @@ * @author Martin Odersky */ // $Id$ + package scala.tools.nsc; import scala.tools.nsc.util.{SourceFile, Position}; import scala.tools.nsc.util.FreshNameCreator; -import scala.tools.util.AbstractFile; +import scala.tools.nsc.io.AbstractFile; import scala.collection.mutable.HashSet; trait CompilationUnits requires Global { diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala index 7e0e81357a..6c9f0affb0 100644 --- a/src/compiler/scala/tools/nsc/Global.scala +++ b/src/compiler/scala/tools/nsc/Global.scala @@ -7,7 +7,7 @@ package scala.tools.nsc; import java.io._; import java.nio.charset._; -import scala.tools.util.{SourceReader,AbstractFile}; +import scala.tools.nsc.io.{SourceReader,AbstractFile}; import scala.tools.nsc.util.ClassPath; import scala.tools.nsc.util.{Position,SourceFile}; import scala.tools.nsc.reporters._; diff --git a/src/compiler/scala/tools/nsc/Interpreter.scala b/src/compiler/scala/tools/nsc/Interpreter.scala index fd77e89c0d..d805b8fc95 100644 --- a/src/compiler/scala/tools/nsc/Interpreter.scala +++ b/src/compiler/scala/tools/nsc/Interpreter.scala @@ -8,7 +8,7 @@ package scala.tools.nsc import reporters._ import nsc.util.SourceFile -import scala.tools.util.PlainFile +import scala.tools.nsc.io.PlainFile import java.io._ import nsc.ast.parser.SyntaxAnalyzer import scala.collection.mutable.{ListBuffer, HashSet, ArrayBuffer} diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala index 1a4611d1fd..3bff265aff 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala @@ -98,7 +98,7 @@ abstract class GenJVM extends SubComponent { addScalaAttr(if (isTopLevelModule(sym)) sym.sourceModule else sym); val outfile = getFile(jclass, ".class"); jclass.writeTo(outfile); - val file = scala.tools.util.AbstractFile.getFile(outfile); + val file = scala.tools.nsc.io.AbstractFile.getFile(outfile); informProgress("wrote " + outfile + " " + (if (file != null) "" + file.file + " " + file.file.exists() else "no file")); diff --git a/src/compiler/scala/tools/util/AbstractFile.scala b/src/compiler/scala/tools/nsc/io/AbstractFile.scala index b6b2abe935..521596350b 100644 --- a/src/compiler/scala/tools/util/AbstractFile.scala +++ b/src/compiler/scala/tools/nsc/io/AbstractFile.scala @@ -7,7 +7,7 @@ // $Id$ -package scala.tools.util; +package scala.tools.nsc.io; import java.io.File; diff --git a/src/compiler/scala/tools/util/AbstractFileReader.scala b/src/compiler/scala/tools/nsc/io/AbstractFileReader.scala index 099d4d9f47..0f0a65f54b 100644 --- a/src/compiler/scala/tools/util/AbstractFileReader.scala +++ b/src/compiler/scala/tools/nsc/io/AbstractFileReader.scala @@ -7,7 +7,7 @@ // $Id$ -package scala.tools.util; +package scala.tools.nsc.io; class AbstractFileReader(val file: AbstractFile) { diff --git a/src/compiler/scala/tools/util/CharArrayFile.scala b/src/compiler/scala/tools/nsc/io/CharArrayFile.scala index c8a58c2129..9288a44451 100644 --- a/src/compiler/scala/tools/util/CharArrayFile.scala +++ b/src/compiler/scala/tools/nsc/io/CharArrayFile.scala @@ -7,7 +7,7 @@ // $Id$ -package scala.tools.util; +package scala.tools.nsc.io; /** diff --git a/src/compiler/scala/tools/util/PlainFile.scala b/src/compiler/scala/tools/nsc/io/PlainFile.scala index ee597b8868..5ab83c447f 100644 --- a/src/compiler/scala/tools/util/PlainFile.scala +++ b/src/compiler/scala/tools/nsc/io/PlainFile.scala @@ -7,7 +7,7 @@ // $Id$ -package scala.tools.util; +package scala.tools.nsc.io; import java.io.{File, FileInputStream, IOException}; diff --git a/src/compiler/scala/tools/util/SourceReader.scala b/src/compiler/scala/tools/nsc/io/SourceReader.scala index fd22aea471..f5be1da58a 100644 --- a/src/compiler/scala/tools/util/SourceReader.scala +++ b/src/compiler/scala/tools/nsc/io/SourceReader.scala @@ -7,7 +7,7 @@ // $Id$ -package scala.tools.util; +package scala.tools.nsc.io; import java.io.{File, FileInputStream, IOException}; diff --git a/src/compiler/scala/tools/util/VirtualFile.scala b/src/compiler/scala/tools/nsc/io/VirtualFile.scala index 58360b2a34..02ce3b0f81 100644 --- a/src/compiler/scala/tools/util/VirtualFile.scala +++ b/src/compiler/scala/tools/nsc/io/VirtualFile.scala @@ -7,7 +7,7 @@ // $Id$ -package scala.tools.util; +package scala.tools.nsc.io; import java.io.{File,IOException}; diff --git a/src/compiler/scala/tools/util/ZipArchive.scala b/src/compiler/scala/tools/nsc/io/ZipArchive.scala index c15b432e4b..84bc7752f8 100644 --- a/src/compiler/scala/tools/util/ZipArchive.scala +++ b/src/compiler/scala/tools/nsc/io/ZipArchive.scala @@ -7,7 +7,7 @@ // $Id$ -package scala.tools.util; +package scala.tools.nsc.io; import java.io.{File, IOException, InputStream}; diff --git a/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala b/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala index bce1e2e202..0df3271bb8 100644 --- a/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala +++ b/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala @@ -3,13 +3,12 @@ * @author Martin Odersky */ // $Id$ + package scala.tools.nsc.symtab; -import java.io.IOException; -import java.io.File; -import scala.tools.nsc.util.Position; -import scala.tools.nsc.util.ClassPath; -import scala.tools.util.{AbstractFile}; +import java.io.{File, IOException}; +import scala.tools.nsc.util.{Position, ClassPath}; +import scala.tools.nsc.io.AbstractFile; import scala.tools.nsc.util.NameTransformer; import scala.collection.mutable.HashMap; import classfile.{ClassfileParser, SymblfileParser}; diff --git a/src/compiler/scala/tools/nsc/symtab/Symbols.scala b/src/compiler/scala/tools/nsc/symtab/Symbols.scala index e21ac25ff1..08df424779 100644 --- a/src/compiler/scala/tools/nsc/symtab/Symbols.scala +++ b/src/compiler/scala/tools/nsc/symtab/Symbols.scala @@ -6,7 +6,7 @@ package scala.tools.nsc.symtab; -import scala.tools.util.AbstractFile; +import scala.tools.nsc.io.AbstractFile; import scala.tools.nsc.util.{Position, SourceFile}; import Flags._; diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala index 8e8cadd21d..489502910c 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala @@ -2,7 +2,9 @@ * Copyright 2005 LAMP/EPFL * @author Martin Odersky */ + // $Id$ + /* Ideas to extend this to an icode reader: 1. Parse classfile a second time, creating a hashmap `code' that associates method symbols with code. @@ -12,12 +14,11 @@ code(new) = code(meth) */ + package scala.tools.nsc.symtab.classfile; import scala.tools.nsc.util.Position; -import scala.tools.util.AbstractFile; -import scala.tools.util.AbstractFileReader; - +import scala.tools.nsc.io.{AbstractFile, AbstractFileReader}; import scala.collection.mutable.ListBuffer; import scala.collection.immutable.{Map, ListMap}; diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/SymblfileParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/SymblfileParser.scala index 587940e6b8..83f296125f 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/SymblfileParser.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/SymblfileParser.scala @@ -3,11 +3,10 @@ * @author Martin Odersky */ // $Id$ -package scala.tools.nsc.symtab.classfile; -import scala.tools.util.{AbstractFile, AbstractFileReader}; +package scala.tools.nsc.symtab.classfile; -import java.io.IOException; +import scala.tools.nsc.io.{AbstractFile, AbstractFileReader}; abstract class SymblfileParser { diff --git a/src/compiler/scala/tools/nsc/util/ClassPath.scala b/src/compiler/scala/tools/nsc/util/ClassPath.scala index 88e5050cbb..5b140f2411 100644 --- a/src/compiler/scala/tools/nsc/util/ClassPath.scala +++ b/src/compiler/scala/tools/nsc/util/ClassPath.scala @@ -11,10 +11,9 @@ package scala.tools.nsc.util import scala.collection.mutable.ArrayBuffer -import scala.tools.util.AbstractFile +import scala.tools.nsc.io.AbstractFile import java.io.File -import java.io.FileNotFoundException import java.util.StringTokenizer /** Richer classpath abstraction than files. diff --git a/src/compiler/scala/tools/nsc/util/SourceFile.scala b/src/compiler/scala/tools/nsc/util/SourceFile.scala index 0c1bd9758c..cf0e71adfe 100644 --- a/src/compiler/scala/tools/nsc/util/SourceFile.scala +++ b/src/compiler/scala/tools/nsc/util/SourceFile.scala @@ -9,8 +9,9 @@ package scala.tools.nsc.util; -import scala.tools.util.AbstractFile; -import scala.tools.util.CharArrayFile; + + +import scala.tools.nsc.io.{AbstractFile, CharArrayFile}; /** Uses positions that are offsets rather than line/column pairs. * diff --git a/test/files/neg/bug558.scala b/test/files/neg/bug558.scala index f88471f776..58b030347c 100644 --- a/test/files/neg/bug558.scala +++ b/test/files/neg/bug558.scala @@ -1,5 +1,5 @@ package scala.tools.nsc.models; -import scala.tools.util._; +import scala.tools.nsc.io.AbstractFile; abstract class NewModel { abstract class SymbolURL { |