diff options
author | Eugene Burmako <xeno.by@gmail.com> | 2012-06-04 13:53:13 +0200 |
---|---|---|
committer | Eugene Burmako <xeno.by@gmail.com> | 2012-06-08 15:32:12 +0200 |
commit | d9103e01b467634d61baa3b131aeb93fca9e20a5 (patch) | |
tree | 2c404b710c45caa8b6302d9c9e37e28dca3bba40 /src | |
parent | 3896a416faffe337a96f873214b02f231f306174 (diff) | |
download | scala-d9103e01b467634d61baa3b131aeb93fca9e20a5.tar.gz scala-d9103e01b467634d61baa3b131aeb93fca9e20a5.tar.bz2 scala-d9103e01b467634d61baa3b131aeb93fca9e20a5.zip |
moves positions to scala.reflect.internal.util
This is the first step of factoring out scala-reflect.jar.
Diffstat (limited to 'src')
92 files changed, 188 insertions, 111 deletions
diff --git a/src/compiler/scala/reflect/internal/Kinds.scala b/src/compiler/scala/reflect/internal/Kinds.scala index eca63c7c15..b736a9192f 100644 --- a/src/compiler/scala/reflect/internal/Kinds.scala +++ b/src/compiler/scala/reflect/internal/Kinds.scala @@ -7,7 +7,7 @@ package scala.reflect package internal import scala.collection.{ mutable, immutable } -import scala.tools.util.StringOps.{ countAsString, countElementsAsString } +import scala.reflect.internal.util.StringOps.{ countAsString, countElementsAsString } trait Kinds { self: SymbolTable => diff --git a/src/compiler/scala/reflect/internal/Positions.scala b/src/compiler/scala/reflect/internal/Positions.scala index bbd8880e35..6ae9b40fcb 100644 --- a/src/compiler/scala/reflect/internal/Positions.scala +++ b/src/compiler/scala/reflect/internal/Positions.scala @@ -3,8 +3,8 @@ package internal trait Positions extends api.Positions { self: SymbolTable => - type Position = scala.tools.nsc.util.Position - val NoPosition = scala.tools.nsc.util.NoPosition + type Position = scala.reflect.internal.util.Position + val NoPosition = scala.reflect.internal.util.NoPosition implicit val PositionTag = ClassTag[Position](classOf[Position]) /** A position that wraps a set of trees. diff --git a/src/compiler/scala/reflect/internal/SymbolTable.scala b/src/compiler/scala/reflect/internal/SymbolTable.scala index cf6db7d438..cadd76b1ba 100644 --- a/src/compiler/scala/reflect/internal/SymbolTable.scala +++ b/src/compiler/scala/reflect/internal/SymbolTable.scala @@ -8,7 +8,6 @@ package internal import scala.collection.{ mutable, immutable } import util._ -import scala.tools.nsc.util.WeakHashSet abstract class SymbolTable extends makro.Universe with Collections diff --git a/src/compiler/scala/reflect/internal/Types.scala b/src/compiler/scala/reflect/internal/Types.scala index ada998bf9e..23921d73cc 100644 --- a/src/compiler/scala/reflect/internal/Types.scala +++ b/src/compiler/scala/reflect/internal/Types.scala @@ -5995,7 +5995,7 @@ trait Types extends api.Types { self: SymbolTable => // Lubs and Glbs --------------------------------------------------------- private def printLubMatrix(btsMap: Map[Type, List[Type]], depth: Int) { - import scala.tools.nsc.util.TableDef + import util.TableDef import TableDef.Column def str(tp: Type) = { if (tp == NoType) "" diff --git a/src/compiler/scala/tools/nsc/util/Position.scala b/src/compiler/scala/reflect/internal/util/Position.scala index d07468e728..3c251b3b31 100644 --- a/src/compiler/scala/tools/nsc/util/Position.scala +++ b/src/compiler/scala/reflect/internal/util/Position.scala @@ -4,8 +4,7 @@ * */ -package scala.tools.nsc -package util +package scala.reflect.internal.util import reflect.ClassTag import reflect.base.Attachments diff --git a/src/compiler/scala/tools/nsc/util/SourceFile.scala b/src/compiler/scala/reflect/internal/util/SourceFile.scala index e1ae96da8c..7c80ddd37d 100644 --- a/src/compiler/scala/tools/nsc/util/SourceFile.scala +++ b/src/compiler/scala/reflect/internal/util/SourceFile.scala @@ -4,10 +4,9 @@ */ -package scala.tools.nsc -package util +package scala.reflect.internal.util -import io.{ AbstractFile, VirtualFile } +import scala.tools.nsc.io.{ AbstractFile, VirtualFile } import scala.collection.mutable.ArrayBuffer import annotation.tailrec import java.util.regex.Pattern diff --git a/src/compiler/scala/tools/util/StringOps.scala b/src/compiler/scala/reflect/internal/util/StringOps.scala index 725e0afb79..281ade8134 100644 --- a/src/compiler/scala/tools/util/StringOps.scala +++ b/src/compiler/scala/reflect/internal/util/StringOps.scala @@ -7,8 +7,7 @@ \* */ -package scala.tools -package util +package scala.reflect.internal.util /** This object provides utility methods to extract elements * from Strings. diff --git a/src/compiler/scala/tools/nsc/util/TableDef.scala b/src/compiler/scala/reflect/internal/util/TableDef.scala index 10c63eeee2..d692a6d8f5 100644 --- a/src/compiler/scala/tools/nsc/util/TableDef.scala +++ b/src/compiler/scala/reflect/internal/util/TableDef.scala @@ -1,5 +1,4 @@ -package scala.tools.nsc -package util +package scala.reflect.internal.util import TableDef._ diff --git a/src/compiler/scala/tools/nsc/util/WeakHashSet.scala b/src/compiler/scala/reflect/internal/util/WeakHashSet.scala index 5bbb766e21..9882aad5e5 100644 --- a/src/compiler/scala/tools/nsc/util/WeakHashSet.scala +++ b/src/compiler/scala/reflect/internal/util/WeakHashSet.scala @@ -1,4 +1,4 @@ -package scala.tools.nsc.util +package scala.reflect.internal.util import scala.collection.mutable import scala.collection.mutable.ArrayBuffer diff --git a/src/compiler/scala/reflect/makro/runtime/AbortMacroException.scala b/src/compiler/scala/reflect/makro/runtime/AbortMacroException.scala index d0d40d6f42..a68910859d 100644 --- a/src/compiler/scala/reflect/makro/runtime/AbortMacroException.scala +++ b/src/compiler/scala/reflect/makro/runtime/AbortMacroException.scala @@ -1,6 +1,6 @@ package scala.reflect.makro package runtime -import scala.tools.nsc.util.Position +import scala.reflect.internal.util.Position class AbortMacroException(val pos: Position, val msg: String) extends Throwable(msg) diff --git a/src/compiler/scala/reflect/runtime/JavaUniverse.scala b/src/compiler/scala/reflect/runtime/JavaUniverse.scala index 9dcf8786c5..d4a83b960d 100644 --- a/src/compiler/scala/reflect/runtime/JavaUniverse.scala +++ b/src/compiler/scala/reflect/runtime/JavaUniverse.scala @@ -14,7 +14,7 @@ class JavaUniverse extends internal.SymbolTable with ReflectSetup with runtime.S type TreeGen = internal.TreeGen - override type Position = scala.tools.nsc.util.Position + override type Position = scala.reflect.internal.util.Position override val gen = new TreeGen { val global: self.type = self } diff --git a/src/compiler/scala/tools/nsc/CompilationUnits.scala b/src/compiler/scala/tools/nsc/CompilationUnits.scala index 2f1e15168a..54b114bf82 100644 --- a/src/compiler/scala/tools/nsc/CompilationUnits.scala +++ b/src/compiler/scala/tools/nsc/CompilationUnits.scala @@ -5,7 +5,8 @@ package scala.tools.nsc -import util.{ FreshNameCreator, Position, NoPosition, BatchSourceFile, SourceFile, NoSourceFile } +import util.FreshNameCreator +import scala.reflect.internal.util.{ Position, NoPosition, BatchSourceFile, SourceFile, NoSourceFile } import scala.collection.mutable import scala.collection.mutable.{ LinkedHashSet, ListBuffer } diff --git a/src/compiler/scala/tools/nsc/CompileServer.scala b/src/compiler/scala/tools/nsc/CompileServer.scala index 6393ade146..fd59319c14 100644 --- a/src/compiler/scala/tools/nsc/CompileServer.scala +++ b/src/compiler/scala/tools/nsc/CompileServer.scala @@ -7,7 +7,7 @@ package scala.tools.nsc import java.io.{ BufferedOutputStream, FileOutputStream, PrintStream } import scala.tools.nsc.reporters.{Reporter, ConsoleReporter} -import scala.tools.nsc.util.FakePos //Position +import scala.reflect.internal.util.FakePos //Position import scala.tools.util.SocketServer import settings.FscSettings diff --git a/src/compiler/scala/tools/nsc/CompileSocket.scala b/src/compiler/scala/tools/nsc/CompileSocket.scala index a4a8e1fd11..7d2abd42fd 100644 --- a/src/compiler/scala/tools/nsc/CompileSocket.scala +++ b/src/compiler/scala/tools/nsc/CompileSocket.scala @@ -13,7 +13,7 @@ import java.security.SecureRandom import io.{ File, Path, Directory, Socket } import scala.util.control.Exception.catching import scala.tools.util.CompileOutputCommon -import scala.tools.util.StringOps.splitWhere +import scala.reflect.internal.util.StringOps.splitWhere import scala.sys.process._ trait HasCompileSocket { diff --git a/src/compiler/scala/tools/nsc/Driver.scala b/src/compiler/scala/tools/nsc/Driver.scala index 0c52954a0b..0051c3bdec 100644 --- a/src/compiler/scala/tools/nsc/Driver.scala +++ b/src/compiler/scala/tools/nsc/Driver.scala @@ -2,7 +2,7 @@ package scala.tools.nsc import scala.tools.nsc.reporters.{Reporter, ConsoleReporter} import Properties.{ versionString, copyrightString } -import scala.tools.nsc.util.{ BatchSourceFile, FakePos } +import scala.reflect.internal.util.{ BatchSourceFile, FakePos } abstract class Driver { diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala index 89298d3d2c..787c9c7f57 100644 --- a/src/compiler/scala/tools/nsc/Global.scala +++ b/src/compiler/scala/tools/nsc/Global.scala @@ -12,7 +12,8 @@ import scala.tools.util.PathResolver import scala.collection.{ mutable, immutable } import io.{ SourceReader, AbstractFile, Path } import reporters.{ Reporter, ConsoleReporter } -import util.{ NoPosition, Exceptional, ClassPath, MergedClassPath, SourceFile, NoSourceFile, Statistics, StatisticsInfo, BatchSourceFile, ScriptSourceFile, ScalaClassLoader, returning } +import util.{ Exceptional, ClassPath, MergedClassPath, Statistics, StatisticsInfo, ScalaClassLoader, returning } +import scala.reflect.internal.util.{ NoPosition, SourceFile, NoSourceFile, BatchSourceFile, ScriptSourceFile } import scala.reflect.internal.pickling.{ PickleBuffer, PickleFormat } import settings.{ AestheticSettings } import symtab.{ Flags, SymbolTable, SymbolLoaders, SymbolTrackers } diff --git a/src/compiler/scala/tools/nsc/Main.scala b/src/compiler/scala/tools/nsc/Main.scala index 4763fab45c..19c872b6d3 100644 --- a/src/compiler/scala/tools/nsc/Main.scala +++ b/src/compiler/scala/tools/nsc/Main.scala @@ -11,7 +11,7 @@ import File.pathSeparator import scala.tools.nsc.interactive.{ RefinedBuildManager, SimpleBuildManager } import scala.tools.nsc.io.AbstractFile import scala.tools.nsc.reporters.{Reporter, ConsoleReporter} -import scala.tools.nsc.util.{ BatchSourceFile, FakePos } //{Position} +import scala.reflect.internal.util.{ BatchSourceFile, FakePos } //{Position} import Properties.{ versionString, copyrightString, residentPromptString, msilLibPath } /** The main class for NSC, a compiler for the programming diff --git a/src/compiler/scala/tools/nsc/Phases.scala b/src/compiler/scala/tools/nsc/Phases.scala index aa0ea1bdd8..896fcb3ca1 100644 --- a/src/compiler/scala/tools/nsc/Phases.scala +++ b/src/compiler/scala/tools/nsc/Phases.scala @@ -6,7 +6,7 @@ package scala.tools.nsc import symtab.Flags -import util.TableDef +import reflect.internal.util.TableDef import language.postfixOps object Phases { diff --git a/src/compiler/scala/tools/nsc/ScalaDoc.scala b/src/compiler/scala/tools/nsc/ScalaDoc.scala index 4fa2cc71e5..5a4b4172c6 100644 --- a/src/compiler/scala/tools/nsc/ScalaDoc.scala +++ b/src/compiler/scala/tools/nsc/ScalaDoc.scala @@ -9,7 +9,7 @@ package scala.tools.nsc import java.io.File.pathSeparator import scala.tools.nsc.doc.DocFactory import scala.tools.nsc.reporters.ConsoleReporter -import scala.tools.nsc.util.FakePos +import scala.reflect.internal.util.FakePos import Properties.msilLibPath /** The main class for scaladoc, a front-end for the Scala compiler diff --git a/src/compiler/scala/tools/nsc/ast/DocComments.scala b/src/compiler/scala/tools/nsc/ast/DocComments.scala index a01756b35b..316faba6e2 100755 --- a/src/compiler/scala/tools/nsc/ast/DocComments.scala +++ b/src/compiler/scala/tools/nsc/ast/DocComments.scala @@ -8,7 +8,7 @@ package ast import symtab._ import reporters._ -import util.{Position, NoPosition} +import scala.reflect.internal.util.{Position, NoPosition} import util.DocStrings._ import scala.reflect.internal.Chars._ import scala.collection.mutable diff --git a/src/compiler/scala/tools/nsc/ast/Positions.scala b/src/compiler/scala/tools/nsc/ast/Positions.scala index 83a67cfbe3..74d1f8ab4b 100644 --- a/src/compiler/scala/tools/nsc/ast/Positions.scala +++ b/src/compiler/scala/tools/nsc/ast/Positions.scala @@ -1,7 +1,7 @@ package scala.tools.nsc package ast -import scala.tools.nsc.util.{ SourceFile, Position, OffsetPosition, NoPosition } +import scala.reflect.internal.util.{ SourceFile, Position, OffsetPosition, NoPosition } trait Positions extends scala.reflect.internal.Positions { self: Global => @@ -14,7 +14,7 @@ trait Positions extends scala.reflect.internal.Positions { // [Eugene] disabling this for now. imo it doesn't justify pollution of the public API // override def _checkSetAnnotation(tree: Tree, annot: TreeAnnotation): Unit = { // if (tree.pos != NoPosition && tree.pos != annot.pos) debugwarn("Overwriting annotation "+ tree.annotation +" of tree "+ tree +" with annotation "+ annot) - // // if ((tree.annotation.isInstanceOf[scala.tools.nsc.util.Position] || !annot.isInstanceOf[scala.tools.nsc.util.Position]) && tree.isInstanceOf[Block]) + // // if ((tree.annotation.isInstanceOf[scala.reflect.internal.util.Position] || !annot.isInstanceOf[scala.reflect.internal.util.Position]) && tree.isInstanceOf[Block]) // // println("Updating block from "+ tree.annotation +" to "+ annot) // } diff --git a/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala b/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala index f702f44338..12b39d9e9c 100755 --- a/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala @@ -9,7 +9,8 @@ package ast.parser import scala.collection.mutable import mutable.{ Buffer, ArrayBuffer, ListBuffer } import scala.util.control.ControlThrowable -import scala.tools.nsc.util.{SourceFile,CharArrayReader} +import scala.tools.nsc.util.CharArrayReader +import scala.reflect.internal.util.SourceFile import scala.xml.{ Text, TextBuffer } import scala.xml.parsing.MarkupParserCommon import scala.xml.Utility.{ isNameStart, isNameChar, isSpace } diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala index 688da4fd04..fd154fe796 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala @@ -10,10 +10,11 @@ package scala.tools.nsc package ast.parser import scala.collection.mutable.{ListBuffer, StringBuilder} -import util.{ SourceFile, OffsetPosition, FreshNameCreator } import scala.reflect.internal.{ ModifierFlags => Flags } -import Tokens._ import scala.reflect.internal.Chars.{ isScalaLetter } +import scala.reflect.internal.util.{ SourceFile, OffsetPosition } +import Tokens._ +import util.FreshNameCreator /** Historical note: JavaParsers started life as a direct copy of Parsers * but at a time when that Parsers had been replaced by a different one. diff --git a/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala b/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala index 1835f645b8..6ba273b8ea 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala @@ -5,7 +5,8 @@ package scala.tools.nsc package ast.parser -import scala.tools.nsc.util._ +import scala.tools.nsc.util.CharArrayReader +import scala.reflect.internal.util._ import scala.reflect.internal.Chars._ import Tokens._ import scala.annotation.switch diff --git a/src/compiler/scala/tools/nsc/ast/parser/SymbolicXMLBuilder.scala b/src/compiler/scala/tools/nsc/ast/parser/SymbolicXMLBuilder.scala index b0204c5971..a4b45482de 100755 --- a/src/compiler/scala/tools/nsc/ast/parser/SymbolicXMLBuilder.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/SymbolicXMLBuilder.scala @@ -10,7 +10,7 @@ import scala.collection.{ mutable, immutable } import xml.{ EntityRef, Text } import xml.XML.{ xmlns } import symtab.Flags.MUTABLE -import scala.tools.util.StringOps.splitWhere +import scala.reflect.internal.util.StringOps.splitWhere import language.implicitConversions /** This class builds instance of `Tree` that represent XML. diff --git a/src/compiler/scala/tools/nsc/backend/icode/BasicBlocks.scala b/src/compiler/scala/tools/nsc/backend/icode/BasicBlocks.scala index b8ecaf1b43..86533c713e 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/BasicBlocks.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/BasicBlocks.scala @@ -9,7 +9,7 @@ package icode import scala.collection.{ mutable, immutable } import mutable.{ ListBuffer, ArrayBuffer } -import util.{ Position, NoPosition } +import scala.reflect.internal.util.{ Position, NoPosition } import backend.icode.analysis.ProgramPoint import language.postfixOps diff --git a/src/compiler/scala/tools/nsc/backend/icode/Members.scala b/src/compiler/scala/tools/nsc/backend/icode/Members.scala index efb4e7a199..00f4a9d262 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/Members.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/Members.scala @@ -9,7 +9,7 @@ package icode import java.io.PrintWriter import scala.collection.{ mutable, immutable } -import util.{ SourceFile, NoSourceFile } +import scala.reflect.internal.util.{ SourceFile, NoSourceFile } import symtab.Flags.{ DEFERRED } trait ReferenceEquality { diff --git a/src/compiler/scala/tools/nsc/backend/icode/Opcodes.scala b/src/compiler/scala/tools/nsc/backend/icode/Opcodes.scala index 3179fc5c56..5f495c8456 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/Opcodes.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/Opcodes.scala @@ -10,7 +10,7 @@ package backend package icode import scala.tools.nsc.ast._ -import scala.tools.nsc.util.{Position,NoPosition} +import scala.reflect.internal.util.{Position,NoPosition} /* A pattern match diff --git a/src/compiler/scala/tools/nsc/backend/icode/Printers.scala b/src/compiler/scala/tools/nsc/backend/icode/Printers.scala index 4ea253d29d..d34d93f147 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/Printers.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/Printers.scala @@ -9,7 +9,7 @@ package icode import java.io.PrintWriter import scala.tools.nsc.symtab.Flags -import scala.tools.nsc.util.Position +import scala.reflect.internal.util.Position trait Printers { self: ICodes => import global._ diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala index 747e7ef989..21260d399c 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala @@ -11,7 +11,7 @@ import java.nio.ByteBuffer import scala.collection.{ mutable, immutable } import scala.reflect.internal.pickling.{ PickleFormat, PickleBuffer } import scala.tools.nsc.symtab._ -import scala.tools.nsc.util.{ SourceFile, NoSourceFile } +import scala.reflect.internal.util.{ SourceFile, NoSourceFile } import scala.reflect.internal.ClassfileConstants._ import ch.epfl.lamp.fjbg._ import JAccessFlags._ diff --git a/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala b/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala index 08e059419a..f332e8cfdd 100644 --- a/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala +++ b/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala @@ -9,7 +9,7 @@ package backend.opt import scala.collection.mutable import scala.tools.nsc.symtab._ -import scala.tools.nsc.util.NoSourceFile +import scala.reflect.internal.util.NoSourceFile /** * @author Iulian Dragos @@ -100,7 +100,7 @@ abstract class Inliners extends SubComponent { } def isBottomType(sym: Symbol) = sym == NullClass || sym == NothingClass - def posToStr(pos: util.Position) = if (pos.isDefined) pos.point.toString else "<nopos>" + def posToStr(pos: scala.reflect.internal.util.Position) = if (pos.isDefined) pos.point.toString else "<nopos>" /** Is the given class a closure? */ def isClosureClass(cls: Symbol): Boolean = diff --git a/src/compiler/scala/tools/nsc/dependencies/DependencyAnalysis.scala b/src/compiler/scala/tools/nsc/dependencies/DependencyAnalysis.scala index 02be916f59..317cc28298 100644 --- a/src/compiler/scala/tools/nsc/dependencies/DependencyAnalysis.scala +++ b/src/compiler/scala/tools/nsc/dependencies/DependencyAnalysis.scala @@ -1,11 +1,11 @@ package scala.tools.nsc package dependencies -import util.SourceFile import io.Path import collection._ import symtab.Flags import scala.tools.nsc.io.AbstractFile +import scala.reflect.internal.util.SourceFile trait DependencyAnalysis extends SubComponent with Files { import global._ diff --git a/src/compiler/scala/tools/nsc/doc/DocFactory.scala b/src/compiler/scala/tools/nsc/doc/DocFactory.scala index 76a8b87ba7..e2e1ddf065 100644 --- a/src/compiler/scala/tools/nsc/doc/DocFactory.scala +++ b/src/compiler/scala/tools/nsc/doc/DocFactory.scala @@ -8,7 +8,7 @@ package doc import scala.util.control.ControlThrowable import reporters.Reporter -import util.{ NoPosition, BatchSourceFile} +import scala.reflect.internal.util.{ NoPosition, BatchSourceFile} import io.{ File, Directory } import DocParser.Parsed diff --git a/src/compiler/scala/tools/nsc/doc/DocParser.scala b/src/compiler/scala/tools/nsc/doc/DocParser.scala index 2bd80f31da..119a2c06e9 100644 --- a/src/compiler/scala/tools/nsc/doc/DocParser.scala +++ b/src/compiler/scala/tools/nsc/doc/DocParser.scala @@ -8,7 +8,7 @@ package nsc package doc import reporters._ -import util._ +import scala.reflect.internal.util._ import interactive.RangePositions import DocParser.Parsed diff --git a/src/compiler/scala/tools/nsc/doc/model/TreeFactory.scala b/src/compiler/scala/tools/nsc/doc/model/TreeFactory.scala index f948d53c8b..fe586c4996 100755 --- a/src/compiler/scala/tools/nsc/doc/model/TreeFactory.scala +++ b/src/compiler/scala/tools/nsc/doc/model/TreeFactory.scala @@ -3,7 +3,7 @@ package doc package model import scala.collection._ -import util.{RangePosition, OffsetPosition, SourceFile} +import scala.reflect.internal.util.{RangePosition, OffsetPosition, SourceFile} /** The goal of this trait is , using makeTree, * to browse a tree to diff --git a/src/compiler/scala/tools/nsc/doc/model/comment/CommentFactory.scala b/src/compiler/scala/tools/nsc/doc/model/comment/CommentFactory.scala index e6bc76f676..996223b9f9 100644 --- a/src/compiler/scala/tools/nsc/doc/model/comment/CommentFactory.scala +++ b/src/compiler/scala/tools/nsc/doc/model/comment/CommentFactory.scala @@ -12,7 +12,7 @@ import reporters.Reporter import scala.collection._ import scala.util.matching.Regex import scala.annotation.switch -import util.{NoPosition, Position} +import scala.reflect.internal.util.{NoPosition, Position} import language.postfixOps /** The comment parser transforms raw comment strings into `Comment` objects. diff --git a/src/compiler/scala/tools/nsc/interactive/BuildManager.scala b/src/compiler/scala/tools/nsc/interactive/BuildManager.scala index 0f89236861..7d36d17a18 100644 --- a/src/compiler/scala/tools/nsc/interactive/BuildManager.scala +++ b/src/compiler/scala/tools/nsc/interactive/BuildManager.scala @@ -9,7 +9,7 @@ package interactive import scala.collection._ import scala.tools.nsc.reporters.{Reporter, ConsoleReporter} -import util.FakePos +import scala.reflect.internal.util.FakePos import dependencies._ import io.AbstractFile diff --git a/src/compiler/scala/tools/nsc/interactive/CompilerControl.scala b/src/compiler/scala/tools/nsc/interactive/CompilerControl.scala index 1b91b06942..801b4ad22b 100644 --- a/src/compiler/scala/tools/nsc/interactive/CompilerControl.scala +++ b/src/compiler/scala/tools/nsc/interactive/CompilerControl.scala @@ -7,11 +7,12 @@ package interactive import scala.util.control.ControlThrowable import scala.tools.nsc.io.AbstractFile -import scala.tools.nsc.util.{SourceFile, Position, WorkScheduler} import scala.tools.nsc.symtab._ import scala.tools.nsc.ast._ import scala.tools.nsc.util.FailedInterrupt import scala.tools.nsc.util.EmptyAction +import scala.tools.nsc.util.WorkScheduler +import scala.reflect.internal.util.{SourceFile, Position} /** Interface of interactive compiler to a client such as an IDE * The model the presentation compiler consists of the following parts: diff --git a/src/compiler/scala/tools/nsc/interactive/ContextTrees.scala b/src/compiler/scala/tools/nsc/interactive/ContextTrees.scala index fc48d4819c..80d2796801 100644 --- a/src/compiler/scala/tools/nsc/interactive/ContextTrees.scala +++ b/src/compiler/scala/tools/nsc/interactive/ContextTrees.scala @@ -6,7 +6,7 @@ package scala.tools.nsc package interactive import collection.mutable.ArrayBuffer -import util.Position +import scala.reflect.internal.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 edf0108e58..82ce59d075 100644 --- a/src/compiler/scala/tools/nsc/interactive/Global.scala +++ b/src/compiler/scala/tools/nsc/interactive/Global.scala @@ -11,7 +11,8 @@ import mutable.{LinkedHashMap, SynchronizedMap, HashSet, SynchronizedSet} import scala.concurrent.SyncVar import scala.util.control.ControlThrowable import scala.tools.nsc.io.{ AbstractFile, LogReplay, Logger, NullLogger, Replayer } -import scala.tools.nsc.util.{ SourceFile, BatchSourceFile, Position, RangePosition, NoPosition, WorkScheduler, MultiHashMap } +import scala.tools.nsc.util.{ WorkScheduler, MultiHashMap } +import scala.reflect.internal.util.{ SourceFile, BatchSourceFile, Position, RangePosition, NoPosition } import scala.tools.nsc.reporters._ import scala.tools.nsc.symtab._ import scala.tools.nsc.ast._ diff --git a/src/compiler/scala/tools/nsc/interactive/InteractiveReporter.scala b/src/compiler/scala/tools/nsc/interactive/InteractiveReporter.scala index 397e83a362..df8fc3b21e 100644 --- a/src/compiler/scala/tools/nsc/interactive/InteractiveReporter.scala +++ b/src/compiler/scala/tools/nsc/interactive/InteractiveReporter.scala @@ -6,7 +6,7 @@ package scala.tools.nsc package interactive import collection.mutable.ArrayBuffer -import util.Position +import scala.reflect.internal.util.Position import reporters.Reporter case class Problem(pos: Position, msg: String, severityLevel: Int) diff --git a/src/compiler/scala/tools/nsc/interactive/Picklers.scala b/src/compiler/scala/tools/nsc/interactive/Picklers.scala index 7c635c6d65..bf920191c8 100644 --- a/src/compiler/scala/tools/nsc/interactive/Picklers.scala +++ b/src/compiler/scala/tools/nsc/interactive/Picklers.scala @@ -5,10 +5,12 @@ package scala.tools.nsc package interactive -import util.{SourceFile, BatchSourceFile, InterruptReq} +import util.InterruptReq +import scala.reflect.internal.util.{SourceFile, BatchSourceFile} import io.{AbstractFile, PlainFile} -import util.{Position, RangePosition, NoPosition, OffsetPosition, TransparentPosition, EmptyAction} +import util.EmptyAction +import scala.reflect.internal.util.{Position, RangePosition, NoPosition, OffsetPosition, TransparentPosition} import io.{Pickler, CondPickler} import io.Pickler._ import collection.mutable diff --git a/src/compiler/scala/tools/nsc/interactive/REPL.scala b/src/compiler/scala/tools/nsc/interactive/REPL.scala index 1d78cc6e1c..1dcc979255 100644 --- a/src/compiler/scala/tools/nsc/interactive/REPL.scala +++ b/src/compiler/scala/tools/nsc/interactive/REPL.scala @@ -6,7 +6,7 @@ package scala.tools.nsc package interactive import scala.concurrent.SyncVar -import scala.tools.nsc.util._ +import scala.reflect.internal.util._ import scala.tools.nsc.symtab._ import scala.tools.nsc.ast._ import scala.tools.nsc.reporters._ @@ -141,7 +141,7 @@ object REPL { */ def compileInstrumented(iSourceName: String, arguments: List[String]): Option[AbstractFile] = { println("compiling "+iSourceName) - val command = new CompilerCommand(iSourceName :: arguments, reporter.error(scala.tools.nsc.util.NoPosition, _)) + val command = new CompilerCommand(iSourceName :: arguments, reporter.error(scala.reflect.internal.util.NoPosition, _)) val virtualDirectoryOpt = if (arguments contains "-d") None diff --git a/src/compiler/scala/tools/nsc/interactive/RangePositions.scala b/src/compiler/scala/tools/nsc/interactive/RangePositions.scala index c3eb06f2ff..06828f3a3a 100644 --- a/src/compiler/scala/tools/nsc/interactive/RangePositions.scala +++ b/src/compiler/scala/tools/nsc/interactive/RangePositions.scala @@ -7,7 +7,8 @@ package interactive import ast.Trees import ast.Positions -import scala.tools.nsc.util.{SourceFile, Position, RangePosition, NoPosition, WorkScheduler} +import scala.reflect.internal.util.{SourceFile, Position, RangePosition, NoPosition} +import scala.tools.nsc.util.WorkScheduler import scala.collection.mutable.ListBuffer /** Handling range positions diff --git a/src/compiler/scala/tools/nsc/interactive/RefinedBuildManager.scala b/src/compiler/scala/tools/nsc/interactive/RefinedBuildManager.scala index bad181eb76..57f0835edd 100644 --- a/src/compiler/scala/tools/nsc/interactive/RefinedBuildManager.scala +++ b/src/compiler/scala/tools/nsc/interactive/RefinedBuildManager.scala @@ -12,7 +12,8 @@ import scala.util.control.Breaks._ import scala.tools.nsc.symtab.Flags import dependencies._ -import util.{FakePos, ClassPath} +import scala.reflect.internal.util.FakePos +import util.ClassPath import io.AbstractFile import scala.tools.util.PathResolver diff --git a/src/compiler/scala/tools/nsc/interactive/RichCompilationUnits.scala b/src/compiler/scala/tools/nsc/interactive/RichCompilationUnits.scala index 9ef7d33549..9b2fee5f1f 100644 --- a/src/compiler/scala/tools/nsc/interactive/RichCompilationUnits.scala +++ b/src/compiler/scala/tools/nsc/interactive/RichCompilationUnits.scala @@ -5,7 +5,7 @@ package scala.tools.nsc package interactive -import scala.tools.nsc.util.{SourceFile, Position, NoPosition} +import scala.reflect.internal.util.{SourceFile, Position, NoPosition} import collection.mutable.ArrayBuffer trait RichCompilationUnits { self: Global => diff --git a/src/compiler/scala/tools/nsc/interactive/ScratchPadMaker.scala b/src/compiler/scala/tools/nsc/interactive/ScratchPadMaker.scala index e2dcc48709..a3f6726b44 100644 --- a/src/compiler/scala/tools/nsc/interactive/ScratchPadMaker.scala +++ b/src/compiler/scala/tools/nsc/interactive/ScratchPadMaker.scala @@ -1,7 +1,7 @@ package scala.tools.nsc package interactive -import util.{SourceFile, BatchSourceFile, RangePosition} +import scala.reflect.internal.util.{SourceFile, BatchSourceFile, RangePosition} import collection.mutable.ArrayBuffer import reflect.internal.Chars.isLineBreakChar diff --git a/src/compiler/scala/tools/nsc/interactive/SimpleBuildManager.scala b/src/compiler/scala/tools/nsc/interactive/SimpleBuildManager.scala index dd06e7dafa..6c9c7249e8 100644 --- a/src/compiler/scala/tools/nsc/interactive/SimpleBuildManager.scala +++ b/src/compiler/scala/tools/nsc/interactive/SimpleBuildManager.scala @@ -10,7 +10,7 @@ import scala.collection._ import scala.tools.nsc.reporters.{Reporter, ConsoleReporter} import dependencies._ -import util.FakePos +import scala.reflect.internal.util.FakePos import io.AbstractFile /** A simple build manager, using the default scalac dependency tracker. diff --git a/src/compiler/scala/tools/nsc/interactive/tests/InteractiveTest.scala b/src/compiler/scala/tools/nsc/interactive/tests/InteractiveTest.scala index 9dc2a8de10..f622f11ffd 100644 --- a/src/compiler/scala/tools/nsc/interactive/tests/InteractiveTest.scala +++ b/src/compiler/scala/tools/nsc/interactive/tests/InteractiveTest.scala @@ -12,8 +12,8 @@ import java.io.File.pathSeparatorChar import java.io.File.separatorChar import scala.annotation.migration -import scala.tools.nsc.util.Position -import scala.tools.nsc.util.SourceFile +import scala.reflect.internal.util.Position +import scala.reflect.internal.util.SourceFile import collection.mutable.ListBuffer diff --git a/src/compiler/scala/tools/nsc/interactive/tests/Tester.scala b/src/compiler/scala/tools/nsc/interactive/tests/Tester.scala index 034db218ae..55198e3617 100644 --- a/src/compiler/scala/tools/nsc/interactive/tests/Tester.scala +++ b/src/compiler/scala/tools/nsc/interactive/tests/Tester.scala @@ -6,7 +6,7 @@ package scala.tools.nsc package interactive package tests -import util._ +import scala.reflect.internal.util._ import reporters._ import io.AbstractFile import collection.mutable.ArrayBuffer diff --git a/src/compiler/scala/tools/nsc/interactive/tests/core/AskCommand.scala b/src/compiler/scala/tools/nsc/interactive/tests/core/AskCommand.scala index 657ef23eed..0cf32a8d8a 100644 --- a/src/compiler/scala/tools/nsc/interactive/tests/core/AskCommand.scala +++ b/src/compiler/scala/tools/nsc/interactive/tests/core/AskCommand.scala @@ -7,8 +7,8 @@ package interactive package tests.core import scala.tools.nsc.interactive.Response -import scala.tools.nsc.util.Position -import scala.tools.nsc.util.SourceFile +import scala.reflect.internal.util.Position +import scala.reflect.internal.util.SourceFile /** * A trait for defining commands that can be queried to the diff --git a/src/compiler/scala/tools/nsc/interactive/tests/core/CoreTestDefs.scala b/src/compiler/scala/tools/nsc/interactive/tests/core/CoreTestDefs.scala index d6102734ab..c8e6b6ccce 100644 --- a/src/compiler/scala/tools/nsc/interactive/tests/core/CoreTestDefs.scala +++ b/src/compiler/scala/tools/nsc/interactive/tests/core/CoreTestDefs.scala @@ -2,7 +2,7 @@ package scala.tools.nsc package interactive package tests.core -import scala.tools.nsc.util.Position +import scala.reflect.internal.util.Position import scala.tools.nsc.interactive.tests.core._ /** Set of core test definitions that are executed for each test run. */ diff --git a/src/compiler/scala/tools/nsc/interactive/tests/core/PresentationCompilerRequestsWorkingMode.scala b/src/compiler/scala/tools/nsc/interactive/tests/core/PresentationCompilerRequestsWorkingMode.scala index d2baaf32c6..18a8eb5fc3 100644 --- a/src/compiler/scala/tools/nsc/interactive/tests/core/PresentationCompilerRequestsWorkingMode.scala +++ b/src/compiler/scala/tools/nsc/interactive/tests/core/PresentationCompilerRequestsWorkingMode.scala @@ -2,8 +2,8 @@ package scala.tools.nsc package interactive package tests.core -import scala.tools.nsc.util.Position -import scala.tools.nsc.util.SourceFile +import scala.reflect.internal.util.Position +import scala.reflect.internal.util.SourceFile trait PresentationCompilerRequestsWorkingMode extends TestResources { diff --git a/src/compiler/scala/tools/nsc/interactive/tests/core/PresentationCompilerTestDef.scala b/src/compiler/scala/tools/nsc/interactive/tests/core/PresentationCompilerTestDef.scala index 8b8be697cc..9cf2aa4fe4 100644 --- a/src/compiler/scala/tools/nsc/interactive/tests/core/PresentationCompilerTestDef.scala +++ b/src/compiler/scala/tools/nsc/interactive/tests/core/PresentationCompilerTestDef.scala @@ -1,7 +1,7 @@ package scala.tools.nsc.interactive.tests.core import scala.tools.nsc.interactive.Global -import scala.tools.nsc.util.Position +import scala.reflect.internal.util.Position trait PresentationCompilerTestDef { diff --git a/src/compiler/scala/tools/nsc/interactive/tests/core/SourcesCollector.scala b/src/compiler/scala/tools/nsc/interactive/tests/core/SourcesCollector.scala index 21e90fe57f..e80b741a8d 100644 --- a/src/compiler/scala/tools/nsc/interactive/tests/core/SourcesCollector.scala +++ b/src/compiler/scala/tools/nsc/interactive/tests/core/SourcesCollector.scala @@ -1,6 +1,6 @@ package scala.tools.nsc.interactive.tests.core -import scala.tools.nsc.util.{SourceFile,BatchSourceFile} +import scala.reflect.internal.util.{SourceFile,BatchSourceFile} import scala.tools.nsc.io.{AbstractFile,Path} private[tests] object SourcesCollector { diff --git a/src/compiler/scala/tools/nsc/interactive/tests/core/TestResources.scala b/src/compiler/scala/tools/nsc/interactive/tests/core/TestResources.scala index 106d1dacb3..887c3cf29b 100644 --- a/src/compiler/scala/tools/nsc/interactive/tests/core/TestResources.scala +++ b/src/compiler/scala/tools/nsc/interactive/tests/core/TestResources.scala @@ -1,7 +1,7 @@ package scala.tools.nsc.interactive.tests.core import scala.tools.nsc.io.Path -import scala.tools.nsc.util.SourceFile +import scala.reflect.internal.util.SourceFile /** Resources used by the test. */ private[tests] trait TestResources extends TestSettings { diff --git a/src/compiler/scala/tools/nsc/interpreter/ExprTyper.scala b/src/compiler/scala/tools/nsc/interpreter/ExprTyper.scala index 79b429e26a..f2438dcc20 100644 --- a/src/compiler/scala/tools/nsc/interpreter/ExprTyper.scala +++ b/src/compiler/scala/tools/nsc/interpreter/ExprTyper.scala @@ -6,7 +6,7 @@ package scala.tools.nsc package interpreter -import util.BatchSourceFile +import scala.reflect.internal.util.BatchSourceFile import scala.tools.nsc.ast.parser.Tokens.EOF trait ExprTyper { diff --git a/src/compiler/scala/tools/nsc/interpreter/ILoopInit.scala b/src/compiler/scala/tools/nsc/interpreter/ILoopInit.scala index 5bc2ee1278..37e4dfaea4 100644 --- a/src/compiler/scala/tools/nsc/interpreter/ILoopInit.scala +++ b/src/compiler/scala/tools/nsc/interpreter/ILoopInit.scala @@ -6,7 +6,7 @@ package scala.tools.nsc package interpreter -import util.Position +import scala.reflect.internal.util.Position import scala.util.control.Exception.ignoring /** diff --git a/src/compiler/scala/tools/nsc/interpreter/IMain.scala b/src/compiler/scala/tools/nsc/interpreter/IMain.scala index d19a83ef8d..2a7adbe781 100644 --- a/src/compiler/scala/tools/nsc/interpreter/IMain.scala +++ b/src/compiler/scala/tools/nsc/interpreter/IMain.scala @@ -7,7 +7,8 @@ package scala.tools.nsc package interpreter import Predef.{ println => _, _ } -import util.{ Set => _, _ } +import util.stringFromWriter +import scala.reflect.internal.util._ import java.net.URL import scala.sys.BooleanProp import io.VirtualDirectory diff --git a/src/compiler/scala/tools/nsc/interpreter/Power.scala b/src/compiler/scala/tools/nsc/interpreter/Power.scala index 1d3c5560fd..57d7cef726 100644 --- a/src/compiler/scala/tools/nsc/interpreter/Power.scala +++ b/src/compiler/scala/tools/nsc/interpreter/Power.scala @@ -8,7 +8,7 @@ package interpreter import scala.collection.{ mutable, immutable } import scala.util.matching.Regex -import scala.tools.nsc.util.{ BatchSourceFile } +import scala.reflect.internal.util.{ BatchSourceFile } import session.{ History } import scala.io.Codec import java.net.{ URL, MalformedURLException } diff --git a/src/compiler/scala/tools/nsc/interpreter/TypeStrings.scala b/src/compiler/scala/tools/nsc/interpreter/TypeStrings.scala index faf80a39a7..56b9c7011c 100644 --- a/src/compiler/scala/tools/nsc/interpreter/TypeStrings.scala +++ b/src/compiler/scala/tools/nsc/interpreter/TypeStrings.scala @@ -13,7 +13,7 @@ import NameTransformer._ import scala.reflect.runtime.{universe => ru} import scala.reflect.{ClassTag, classTag} import typechecker.DestructureTypes -import scala.tools.util.StringOps.ojoin +import scala.reflect.internal.util.StringOps.ojoin import language.implicitConversions /** A more principled system for turning types into strings. diff --git a/src/compiler/scala/tools/nsc/io/AbstractFile.scala b/src/compiler/scala/tools/nsc/io/AbstractFile.scala index 08b9df2fa8..3faaeaeaec 100644 --- a/src/compiler/scala/tools/nsc/io/AbstractFile.scala +++ b/src/compiler/scala/tools/nsc/io/AbstractFile.scala @@ -8,6 +8,8 @@ package scala.tools.nsc package io import java.io.{ FileOutputStream, IOException, InputStream, OutputStream, BufferedOutputStream } +// [scala-reflect.jar migration note] uncomment when creating scala-reflect.jar +// import java.io.{ File => JFile } import java.net.URL import scala.collection.mutable.ArrayBuffer diff --git a/src/compiler/scala/tools/nsc/io/Directory.scala b/src/compiler/scala/tools/nsc/io/Directory.scala index b4ceba682a..0eecd9a6e2 100644 --- a/src/compiler/scala/tools/nsc/io/Directory.scala +++ b/src/compiler/scala/tools/nsc/io/Directory.scala @@ -9,6 +9,9 @@ package scala.tools.nsc package io +// [scala-reflect.jar migration note] uncomment when creating scala-reflect.jar +// import java.io.{ File => JFile } + object Directory { import scala.util.Properties.{ tmpDir, userHome, userDir } diff --git a/src/compiler/scala/tools/nsc/io/File.scala b/src/compiler/scala/tools/nsc/io/File.scala index 06cb20e4ac..4cea8439b1 100644 --- a/src/compiler/scala/tools/nsc/io/File.scala +++ b/src/compiler/scala/tools/nsc/io/File.scala @@ -13,6 +13,8 @@ package io import java.io.{ FileInputStream, FileOutputStream, BufferedReader, BufferedWriter, InputStreamReader, OutputStreamWriter, BufferedInputStream, BufferedOutputStream, IOException, PrintStream, PrintWriter, Closeable => JCloseable } +// [scala-reflect.jar migration note] uncomment when creating scala-reflect.jar +// import java.io.{ File => JFile } import java.nio.channels.{ Channel, FileChannel } import scala.io.Codec import language.{reflectiveCalls, implicitConversions} diff --git a/src/compiler/scala/tools/nsc/io/NoAbstractFile.scala b/src/compiler/scala/tools/nsc/io/NoAbstractFile.scala index 36cf42d7ec..e468356722 100644 --- a/src/compiler/scala/tools/nsc/io/NoAbstractFile.scala +++ b/src/compiler/scala/tools/nsc/io/NoAbstractFile.scala @@ -7,6 +7,8 @@ package scala.tools.nsc package io import java.io.InputStream +// [scala-reflect.jar migration note] uncomment when creating scala-reflect.jar +// import java.io.{ File => JFile } /** A distinguished object so you can avoid both null * and Option. diff --git a/src/compiler/scala/tools/nsc/io/Path.scala b/src/compiler/scala/tools/nsc/io/Path.scala index b8cf15bfcf..1db015e2f5 100644 --- a/src/compiler/scala/tools/nsc/io/Path.scala +++ b/src/compiler/scala/tools/nsc/io/Path.scala @@ -9,6 +9,8 @@ package io import java.io.{ FileInputStream, FileOutputStream, BufferedReader, BufferedWriter, InputStreamReader, OutputStreamWriter, BufferedInputStream, BufferedOutputStream, RandomAccessFile } +// [scala-reflect.jar migration note] uncomment when creating scala-reflect.jar +// import java.io.{ File => JFile } import java.net.{ URI, URL } import scala.util.Random.alphanumeric import language.implicitConversions @@ -42,7 +44,8 @@ object Path { if (i < 0) "" else name.substring(i + 1).toLowerCase } - def isJarOrZip(f: Path, examineFile: Boolean = true) = Jar.isJarOrZip(f, examineFile) + // [Eugene++] I hope that noone relied on this method +// def isJarOrZip(f: Path, examineFile: Boolean = true) = Jar.isJarOrZip(f, examineFile) // not certain these won't be problematic, but looks good so far implicit def string2path(s: String): Path = apply(s) diff --git a/src/compiler/scala/tools/nsc/io/SourceReader.scala b/src/compiler/scala/tools/nsc/io/SourceReader.scala index 324c5e4111..2e146becdf 100644 --- a/src/compiler/scala/tools/nsc/io/SourceReader.scala +++ b/src/compiler/scala/tools/nsc/io/SourceReader.scala @@ -28,7 +28,7 @@ class SourceReader(decoder: CharsetDecoder, reporter: Reporter) { private var chars: CharBuffer = CharBuffer.allocate(0x4000) private def reportEncodingError(filename:String) = { - reporter.error(util.NoPosition, + reporter.error(scala.reflect.internal.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/VirtualFile.scala b/src/compiler/scala/tools/nsc/io/VirtualFile.scala index 450d86b599..48826ed191 100644 --- a/src/compiler/scala/tools/nsc/io/VirtualFile.scala +++ b/src/compiler/scala/tools/nsc/io/VirtualFile.scala @@ -8,6 +8,8 @@ package scala.tools.nsc package io import java.io.{ ByteArrayInputStream, ByteArrayOutputStream, InputStream, OutputStream } +// [scala-reflect.jar migration note] uncomment when creating scala-reflect.jar +// import java.io.{ File => JFile } /** This class implements an in-memory file. * diff --git a/src/compiler/scala/tools/nsc/io/ZipArchive.scala b/src/compiler/scala/tools/nsc/io/ZipArchive.scala index 01f3619ba7..e61a9ba0da 100644 --- a/src/compiler/scala/tools/nsc/io/ZipArchive.scala +++ b/src/compiler/scala/tools/nsc/io/ZipArchive.scala @@ -8,6 +8,8 @@ package io import java.net.URL import java.io.{ IOException, InputStream, ByteArrayInputStream } +// [scala-reflect.jar migration note] uncomment when creating scala-reflect.jar +// import java.io.{ File => JFile } import java.util.zip.{ ZipEntry, ZipFile, ZipInputStream } import scala.collection.{ immutable, mutable } import annotation.tailrec diff --git a/src/compiler/scala/tools/nsc/javac/JavaParsers.scala b/src/compiler/scala/tools/nsc/javac/JavaParsers.scala index f71e067366..e2203e07b3 100644 --- a/src/compiler/scala/tools/nsc/javac/JavaParsers.scala +++ b/src/compiler/scala/tools/nsc/javac/JavaParsers.scala @@ -8,7 +8,7 @@ package scala.tools.nsc package javac -import scala.tools.nsc.util.OffsetPosition +import scala.reflect.internal.util.OffsetPosition import scala.collection.mutable.ListBuffer import symtab.Flags import JavaTokens._ diff --git a/src/compiler/scala/tools/nsc/javac/JavaScanners.scala b/src/compiler/scala/tools/nsc/javac/JavaScanners.scala index d47756e757..73b5a752b4 100644 --- a/src/compiler/scala/tools/nsc/javac/JavaScanners.scala +++ b/src/compiler/scala/tools/nsc/javac/JavaScanners.scala @@ -6,7 +6,8 @@ package scala.tools.nsc package javac -import scala.tools.nsc.util._ +import scala.tools.nsc.util.JavaCharArrayReader +import scala.reflect.internal.util._ import scala.reflect.internal.Chars._ import JavaTokens._ import scala.annotation.switch diff --git a/src/compiler/scala/tools/nsc/matching/ParallelMatching.scala b/src/compiler/scala/tools/nsc/matching/ParallelMatching.scala index 7346d9c59f..0d1356a6b0 100644 --- a/src/compiler/scala/tools/nsc/matching/ParallelMatching.scala +++ b/src/compiler/scala/tools/nsc/matching/ParallelMatching.scala @@ -9,7 +9,7 @@ package matching import PartialFunction._ import scala.collection.{ mutable } -import util.Position +import scala.reflect.internal.util.Position import transform.ExplicitOuter import symtab.Flags import mutable.ListBuffer diff --git a/src/compiler/scala/tools/nsc/plugins/Plugin.scala b/src/compiler/scala/tools/nsc/plugins/Plugin.scala index 48c4a9b5b3..7f9df2235a 100644 --- a/src/compiler/scala/tools/nsc/plugins/Plugin.scala +++ b/src/compiler/scala/tools/nsc/plugins/Plugin.scala @@ -6,7 +6,7 @@ package scala.tools.nsc package plugins -import io.{ File, Path } +import io.{ File, Path, Jar } import java.net.URLClassLoader import java.util.jar.JarFile import java.util.zip.ZipException @@ -132,7 +132,8 @@ object Plugin { val alljars = (jars ::: (for { dir <- dirs if dir.isDirectory entry <- dir.toDirectory.files.toList sortBy (_.name) - if Path.isJarOrZip(entry) +// was: if Path.isJarOrZip(entry) + if Jar.isJarOrZip(entry) pdesc <- loadDescription(entry) if !(ignoring contains pdesc.name) } yield entry)).distinct diff --git a/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala b/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala index ab8fe23909..cb85e49d55 100644 --- a/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala +++ b/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala @@ -8,7 +8,7 @@ package reporters import scala.collection.mutable import scala.tools.nsc.Settings -import scala.tools.nsc.util.Position +import scala.reflect.internal.util.Position /** * This reporter implements filtering. diff --git a/src/compiler/scala/tools/nsc/reporters/ConsoleReporter.scala b/src/compiler/scala/tools/nsc/reporters/ConsoleReporter.scala index 956c43c35a..dff900383e 100644 --- a/src/compiler/scala/tools/nsc/reporters/ConsoleReporter.scala +++ b/src/compiler/scala/tools/nsc/reporters/ConsoleReporter.scala @@ -7,8 +7,7 @@ package scala.tools.nsc package reporters import java.io.{ BufferedReader, IOException, PrintWriter } -import util._ -import scala.tools.util.StringOps +import scala.reflect.internal.util._ /** * This class implements a Reporter that displays messages on a text diff --git a/src/compiler/scala/tools/nsc/reporters/Reporter.scala b/src/compiler/scala/tools/nsc/reporters/Reporter.scala index 309fc5733f..303a477491 100644 --- a/src/compiler/scala/tools/nsc/reporters/Reporter.scala +++ b/src/compiler/scala/tools/nsc/reporters/Reporter.scala @@ -6,9 +6,8 @@ package scala.tools.nsc package reporters -import scala.tools.nsc.util._ -import scala.tools.util.StringOps -import StringOps._ +import scala.reflect.internal.util._ +import scala.reflect.internal.util.StringOps._ /** * This interface provides methods to issue information, warning and @@ -78,8 +77,8 @@ abstract class Reporter { } // sbt compat - @deprecated("Moved to scala.tools.util.StringOps", "2.10.0") + @deprecated("Moved to scala.reflect.internal.util.StringOps", "2.10.0") def countElementsAsString(n: Int, elements: String): String = StringOps.countElementsAsString(n, elements) - @deprecated("Moved to scala.tools.util.StringOps", "2.10.0") + @deprecated("Moved to scala.reflect.internal.util.StringOps", "2.10.0") def countAsString(n: Int): String = StringOps.countAsString(n) } diff --git a/src/compiler/scala/tools/nsc/reporters/StoreReporter.scala b/src/compiler/scala/tools/nsc/reporters/StoreReporter.scala index 12edd9bf31..5c3f7b8965 100644 --- a/src/compiler/scala/tools/nsc/reporters/StoreReporter.scala +++ b/src/compiler/scala/tools/nsc/reporters/StoreReporter.scala @@ -7,7 +7,7 @@ package scala.tools.nsc package reporters import scala.collection.mutable -import scala.tools.nsc.util.Position +import scala.reflect.internal.util.Position /** * This class implements a Reporter that displays messages on a text diff --git a/src/compiler/scala/tools/nsc/scratchpad/SourceInserter.scala b/src/compiler/scala/tools/nsc/scratchpad/SourceInserter.scala index 311aa6e324..42a35dc642 100644 --- a/src/compiler/scala/tools/nsc/scratchpad/SourceInserter.scala +++ b/src/compiler/scala/tools/nsc/scratchpad/SourceInserter.scala @@ -2,7 +2,7 @@ package scala.tools.nsc package scratchpad import java.io.Writer -import util.SourceFile +import scala.reflect.internal.util.SourceFile import reflect.internal.Chars._ diff --git a/src/compiler/scala/tools/nsc/settings/MutableSettings.scala b/src/compiler/scala/tools/nsc/settings/MutableSettings.scala index c0d9a677e8..fc833e2c26 100644 --- a/src/compiler/scala/tools/nsc/settings/MutableSettings.scala +++ b/src/compiler/scala/tools/nsc/settings/MutableSettings.scala @@ -8,8 +8,8 @@ package scala.tools package nsc package settings -import io.{ AbstractFile, Path, PlainFile, VirtualDirectory } -import scala.tools.util.StringOps +import io.{ AbstractFile, Jar, Path, PlainFile, VirtualDirectory } +import scala.reflect.internal.util.StringOps import scala.collection.mutable.ListBuffer import scala.io.Source import scala.reflect.{ ClassTag, classTag } @@ -255,7 +255,8 @@ class MutableSettings(val errorFn: String => Unit) private def checkDir(dir: AbstractFile, name: String, allowJar: Boolean = false): AbstractFile = ( if (dir != null && dir.isDirectory) dir - else if (allowJar && dir == null && Path.isJarOrZip(name, false)) +// was: else if (allowJar && dir == null && Path.isJarOrZip(name, false)) + else if (allowJar && dir == null && Jar.isJarOrZip(name, false)) new PlainFile(Path(name)) else throw new FatalError(name + " does not exist or is not a directory") diff --git a/src/compiler/scala/tools/nsc/symtab/BrowsingLoaders.scala b/src/compiler/scala/tools/nsc/symtab/BrowsingLoaders.scala index 5f7deb87bd..25d835790e 100644 --- a/src/compiler/scala/tools/nsc/symtab/BrowsingLoaders.scala +++ b/src/compiler/scala/tools/nsc/symtab/BrowsingLoaders.scala @@ -6,7 +6,7 @@ package scala.tools.nsc package symtab -import scala.tools.nsc.util.BatchSourceFile +import scala.reflect.internal.util.BatchSourceFile import scala.tools.nsc.io.AbstractFile /** A subclass of SymbolLoaders that implements browsing behavior. diff --git a/src/compiler/scala/tools/nsc/symtab/clr/CLRTypes.scala b/src/compiler/scala/tools/nsc/symtab/clr/CLRTypes.scala index 7be0fcb146..d3b6c9238d 100644 --- a/src/compiler/scala/tools/nsc/symtab/clr/CLRTypes.scala +++ b/src/compiler/scala/tools/nsc/symtab/clr/CLRTypes.scala @@ -12,7 +12,7 @@ import java.util.{Comparator, StringTokenizer} import scala.util.Sorting import ch.epfl.lamp.compiler.msil._ import scala.collection.{ mutable, immutable } -import scala.tools.nsc.util.{Position, NoPosition} +import scala.reflect.internal.util.{Position, NoPosition} /** * Collects all types from all reference assemblies. diff --git a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala index 4504eaad38..ae6ec8511c 100644 --- a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala +++ b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala @@ -1695,7 +1695,7 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers { } } - private def forwardCall(pos: util.Position, receiver: Tree, paramss: List[List[ValDef]]): Tree = { + private def forwardCall(pos: scala.reflect.internal.util.Position, receiver: Tree, paramss: List[List[ValDef]]): Tree = { val argss = mmap(paramss)(x => Ident(x.symbol)) def mkApply(fun: Tree, args: List[Tree]) = Apply(fun, args) atPos(pos) { (receiver /: argss) (mkApply) } @@ -1722,7 +1722,7 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers { * } * }} */ - private def forwardCtorCall(pos: util.Position, receiver: Tree, paramss: List[List[ValDef]], clazz: Symbol): Tree = { + private def forwardCtorCall(pos: scala.reflect.internal.util.Position, receiver: Tree, paramss: List[List[ValDef]], clazz: Symbol): Tree = { /** A constructor parameter `f` initializes a specialized field * iff: diff --git a/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala b/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala index affa9cd63b..94e7dc0d65 100644 --- a/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala +++ b/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala @@ -7,7 +7,7 @@ package scala.tools.nsc package typechecker import scala.collection.{ mutable, immutable } -import scala.tools.util.StringOps.{ countElementsAsString, countAsString } +import scala.reflect.internal.util.StringOps.{ countElementsAsString, countAsString } import symtab.Flags.{ PRIVATE, PROTECTED } trait ContextErrors { diff --git a/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala b/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala index 9d6b4a589c..465b1007cb 100644 --- a/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala +++ b/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala @@ -7,7 +7,7 @@ package typechecker import symtab.Flags._ import scala.collection.{ mutable, immutable } -import scala.tools.util.StringOps.{ ojoin } +import scala.reflect.internal.util.StringOps.{ ojoin } import scala.reflect.ClassTag import scala.reflect.runtime.{ universe => ru } import language.higherKinds diff --git a/src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala b/src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala index 85b2039765..f64c4a4ce1 100644 --- a/src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala +++ b/src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala @@ -377,7 +377,7 @@ trait NamesDefaults { self: Analyzer => */ def addDefaults(givenArgs: List[Tree], qual: Option[Tree], targs: List[Tree], previousArgss: List[List[Tree]], params: List[Symbol], - pos: util.Position, context: Context): (List[Tree], List[Symbol]) = { + pos: scala.reflect.internal.util.Position, context: Context): (List[Tree], List[Symbol]) = { if (givenArgs.length < params.length) { val (missing, positional) = missingParams(givenArgs, params) if (missing forall (_.hasDefault)) { diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index f46d161da5..a7c69a4e39 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -13,7 +13,7 @@ package scala.tools.nsc package typechecker import scala.collection.mutable -import scala.tools.nsc.util.BatchSourceFile +import scala.reflect.internal.util.BatchSourceFile import mutable.ListBuffer import symtab.Flags._ import util.Statistics diff --git a/src/compiler/scala/tools/nsc/util/ClassPath.scala b/src/compiler/scala/tools/nsc/util/ClassPath.scala index 0636fcf581..9755fb6c60 100644 --- a/src/compiler/scala/tools/nsc/util/ClassPath.scala +++ b/src/compiler/scala/tools/nsc/util/ClassPath.scala @@ -10,7 +10,7 @@ package util import java.net.URL import scala.collection.{ mutable, immutable } import io.{ File, Directory, Path, Jar, AbstractFile } -import scala.tools.util.StringOps.splitWhere +import scala.reflect.internal.util.StringOps.splitWhere import scala.reflect.ClassTag import Jar.isJarOrZip import File.pathSeparator diff --git a/src/compiler/scala/tools/nsc/util/Exceptional.scala b/src/compiler/scala/tools/nsc/util/Exceptional.scala index 7c093b7866..90d032518a 100644 --- a/src/compiler/scala/tools/nsc/util/Exceptional.scala +++ b/src/compiler/scala/tools/nsc/util/Exceptional.scala @@ -3,7 +3,7 @@ package util import java.util.concurrent.ExecutionException import java.lang.reflect.{ InvocationTargetException, UndeclaredThrowableException } -import scala.tools.util.StringOps._ +import scala.reflect.internal.util.StringOps._ import language.implicitConversions object Exceptional { diff --git a/src/compiler/scala/tools/nsc/util/FreshNameCreator.scala b/src/compiler/scala/tools/nsc/util/FreshNameCreator.scala index 88fc6718a2..16bf748414 100644 --- a/src/compiler/scala/tools/nsc/util/FreshNameCreator.scala +++ b/src/compiler/scala/tools/nsc/util/FreshNameCreator.scala @@ -16,9 +16,9 @@ trait FreshNameCreator { def newName(prefix: String): String @deprecated("use newName(prefix)", "2.9.0") - def newName(pos: util.Position, prefix: String): String = newName(prefix) + def newName(pos: scala.reflect.internal.util.Position, prefix: String): String = newName(prefix) @deprecated("use newName()", "2.9.0") - def newName(pos: util.Position): String = newName() + def newName(pos: scala.reflect.internal.util.Position): String = newName() } object FreshNameCreator { diff --git a/src/compiler/scala/tools/nsc/util/package.scala b/src/compiler/scala/tools/nsc/util/package.scala index 1336cca3c5..2229b8d997 100644 --- a/src/compiler/scala/tools/nsc/util/package.scala +++ b/src/compiler/scala/tools/nsc/util/package.scala @@ -86,4 +86,57 @@ package object util { lazy val trace = new SimpleTracer(System.out) lazy val errtrace = new SimpleTracer(System.err) + @deprecated("Moved to scala.reflect.internal.util.StringOps", "2.10.0") + val StringOps = scala.reflect.internal.util.StringOps + + @deprecated("Moved to scala.reflect.internal.util.StringOps", "2.10.0") + type StringOps = scala.reflect.internal.util.StringOps + + @deprecated("Moved to scala.reflect.internal.util.TableDef", "2.10.0") + val TableDef = scala.reflect.internal.util.TableDef + + @deprecated("Moved to scala.reflect.internal.util.TableDef", "2.10.0") + type TableDef[T] = scala.reflect.internal.util.TableDef[T] + + @deprecated("scala.reflect.internal.util.WeakHashSet", "2.10.0") + type WeakHashSet[T <: AnyRef] = scala.reflect.internal.util.WeakHashSet[T] + + @deprecated("Moved to scala.reflect.internal.util.Position", "2.10.0") + val Position = scala.reflect.internal.util.Position + + @deprecated("Moved to scala.reflect.internal.util.Position", "2.10.0") + type Position = scala.reflect.internal.util.Position + + @deprecated("Moved to scala.reflect.internal.util.NoPosition", "2.10.0") + val NoPosition = scala.reflect.internal.util.NoPosition + + @deprecated("Moved to scala.reflect.internal.util.FakePos", "2.10.0") + val FakePos = scala.reflect.internal.util.FakePos + + @deprecated("Moved to scala.reflect.internal.util.FakePos", "2.10.0") + type FakePos = scala.reflect.internal.util.FakePos + + @deprecated("Moved to scala.reflect.internal.util.OffsetPosition", "2.10.0") + type OffsetPosition = scala.reflect.internal.util.OffsetPosition + + @deprecated("Moved to scala.reflect.internal.util.RangePosition", "2.10.0") + type RangePosition = scala.reflect.internal.util.RangePosition + + @deprecated("Moved to scala.reflect.internal.util.SourceFile", "2.10.0") + type SourceFile = scala.reflect.internal.util.SourceFile + + @deprecated("Moved to scala.reflect.internal.util.NoSourceFile", "2.10.0") + val NoSourceFile = scala.reflect.internal.util.NoSourceFile + + @deprecated("Moved to scala.reflect.internal.util.NoFile", "2.10.0") + val NoFile = scala.reflect.internal.util.NoFile + + @deprecated("Moved to scala.reflect.internal.util.ScriptSourceFile", "2.10.0") + val ScriptSourceFile = scala.reflect.internal.util.ScriptSourceFile + + @deprecated("Moved to scala.reflect.internal.util.ScriptSourceFile", "2.10.0") + type ScriptSourceFile = scala.reflect.internal.util.ScriptSourceFile + + @deprecated("Moved to scala.reflect.internal.util.BatchSourceFile", "2.10.0") + type BatchSourceFile = scala.reflect.internal.util.BatchSourceFile } diff --git a/src/compiler/scala/tools/reflect/FrontEnds.scala b/src/compiler/scala/tools/reflect/FrontEnds.scala index 0e4dbd406a..d8f07fb2e5 100644 --- a/src/compiler/scala/tools/reflect/FrontEnds.scala +++ b/src/compiler/scala/tools/reflect/FrontEnds.scala @@ -7,7 +7,7 @@ import scala.reflect.ClassTag trait FrontEnds extends scala.reflect.api.FrontEnds { - type Position = scala.tools.nsc.util.Position + type Position = scala.reflect.internal.util.Position def mkConsoleFrontEnd(minSeverity: Int = 1): FrontEnd = { val settings = new Settings() diff --git a/src/compiler/scala/tools/reflect/ToolBoxFactory.scala b/src/compiler/scala/tools/reflect/ToolBoxFactory.scala index 741f1b268f..7cf515425d 100644 --- a/src/compiler/scala/tools/reflect/ToolBoxFactory.scala +++ b/src/compiler/scala/tools/reflect/ToolBoxFactory.scala @@ -8,9 +8,9 @@ import scala.tools.nsc.Global import scala.tools.nsc.typechecker.Modes import scala.tools.nsc.io.VirtualDirectory import scala.tools.nsc.interpreter.AbstractFileClassLoader -import scala.tools.nsc.util.{FreshNameCreator, BatchSourceFile} +import scala.tools.nsc.util.FreshNameCreator import scala.reflect.internal.Flags -import scala.tools.nsc.util.{NoSourceFile, NoFile} +import scala.reflect.internal.util.{BatchSourceFile, NoSourceFile, NoFile} import java.lang.{Class => jClass} import scala.compat.Platform.EOL import scala.reflect.NameTransformer @@ -289,7 +289,7 @@ abstract class ToolBoxFactory[U <: JavaUniverse](val u: U) { factorySelf => lazy val compiler: ToolBoxGlobal = { try { - val errorFn: String => Unit = msg => frontEnd.log(scala.tools.nsc.util.NoPosition, msg, frontEnd.ERROR) + val errorFn: String => Unit = msg => frontEnd.log(scala.reflect.internal.util.NoPosition, msg, frontEnd.ERROR) val command = new CompilerCommand(arguments.toList, errorFn) command.settings.outputDirs setSingleOutput virtualDirectory val instance = new ToolBoxGlobal(command.settings, new FrontEndToReporterProxy(frontEnd) { val settings = command.settings }) |