diff options
author | Eugene Burmako <xeno.by@gmail.com> | 2012-06-06 09:44:13 +0200 |
---|---|---|
committer | Eugene Burmako <xeno.by@gmail.com> | 2012-06-08 15:31:52 +0200 |
commit | bdff66e2730518f449634375b1f3d19689d72b1e (patch) | |
tree | e7911d43c88d0546b18eaed380aa13503141cb9d /src/compiler | |
parent | 252a44864786b6832b9da4c29d1ac9aad48c4291 (diff) | |
download | scala-bdff66e2730518f449634375b1f3d19689d72b1e.tar.gz scala-bdff66e2730518f449634375b1f3d19689d72b1e.tar.bz2 scala-bdff66e2730518f449634375b1f3d19689d72b1e.zip |
removes tags and their incantations from Predef
All tags and reflection-related stuff requires a prefix,
be it scala.reflect for simple tags (ArrayTags and ClassTags),
or scala.reflect.basis/scala.reflect.runtime.universe for type tags.
Diffstat (limited to 'src/compiler')
16 files changed, 17 insertions, 0 deletions
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala index 57124b9c1c..89298d3d2c 100644 --- a/src/compiler/scala/tools/nsc/Global.scala +++ b/src/compiler/scala/tools/nsc/Global.scala @@ -30,6 +30,7 @@ import backend.opt.{ Inliners, InlineExceptionHandlers, ClosureElimination, Dead import backend.icode.analysis._ import language.postfixOps import reflect.internal.StdAttachments +import scala.reflect.ClassTag class Global(var currentSettings: Settings, var reporter: Reporter) extends SymbolTable diff --git a/src/compiler/scala/tools/nsc/interpreter/ILoop.scala b/src/compiler/scala/tools/nsc/interpreter/ILoop.scala index fdf7db1b9f..e5e7d7081d 100644 --- a/src/compiler/scala/tools/nsc/interpreter/ILoop.scala +++ b/src/compiler/scala/tools/nsc/interpreter/ILoop.scala @@ -24,6 +24,7 @@ import util.ScalaClassLoader import ScalaClassLoader._ import scala.tools.util._ import language.{implicitConversions, existentials} +import scala.reflect.{ClassTag, classTag} import scala.tools.reflect.StdTags._ /** The Scala interactive shell. It provides a read-eval-print loop diff --git a/src/compiler/scala/tools/nsc/interpreter/IMain.scala b/src/compiler/scala/tools/nsc/interpreter/IMain.scala index 0be8579d30..d19a83ef8d 100644 --- a/src/compiler/scala/tools/nsc/interpreter/IMain.scala +++ b/src/compiler/scala/tools/nsc/interpreter/IMain.scala @@ -26,6 +26,7 @@ import java.util.concurrent.Future import typechecker.Analyzer import language.implicitConversions import scala.reflect.runtime.{ universe => ru } +import scala.reflect.{ ClassTag, classTag } import scala.tools.reflect.StdTags._ /** directory to save .class files to */ diff --git a/src/compiler/scala/tools/nsc/interpreter/NamedParam.scala b/src/compiler/scala/tools/nsc/interpreter/NamedParam.scala index 61a61de1e9..3a69ea86b5 100644 --- a/src/compiler/scala/tools/nsc/interpreter/NamedParam.scala +++ b/src/compiler/scala/tools/nsc/interpreter/NamedParam.scala @@ -9,6 +9,7 @@ package interpreter import NamedParam._ import language.implicitConversions import scala.reflect.runtime.{universe => ru} +import scala.reflect.{ClassTag, classTag} trait NamedParamCreator { protected def freshName: () => String diff --git a/src/compiler/scala/tools/nsc/interpreter/Power.scala b/src/compiler/scala/tools/nsc/interpreter/Power.scala index ee69c83f4d..1d3c5560fd 100644 --- a/src/compiler/scala/tools/nsc/interpreter/Power.scala +++ b/src/compiler/scala/tools/nsc/interpreter/Power.scala @@ -15,6 +15,7 @@ import java.net.{ URL, MalformedURLException } import io.{ Path } import language.implicitConversions import scala.reflect.runtime.{universe => ru} +import scala.reflect.{ClassTag, classTag} /** Collecting some power mode examples. diff --git a/src/compiler/scala/tools/nsc/interpreter/RichClass.scala b/src/compiler/scala/tools/nsc/interpreter/RichClass.scala index 2e735e3b9b..32eb1e95c1 100644 --- a/src/compiler/scala/tools/nsc/interpreter/RichClass.scala +++ b/src/compiler/scala/tools/nsc/interpreter/RichClass.scala @@ -6,6 +6,8 @@ package scala.tools.nsc package interpreter +import scala.reflect.{ ClassTag, classTag } + class RichClass[T](val clazz: Class[T]) { def toTag: ClassTag[T] = ClassTag[T](clazz) def toTypeString: String = TypeStrings.fromClazz(clazz) diff --git a/src/compiler/scala/tools/nsc/interpreter/TypeStrings.scala b/src/compiler/scala/tools/nsc/interpreter/TypeStrings.scala index c5888129f5..12bba9c86a 100644 --- a/src/compiler/scala/tools/nsc/interpreter/TypeStrings.scala +++ b/src/compiler/scala/tools/nsc/interpreter/TypeStrings.scala @@ -11,6 +11,7 @@ import r.TypeVariable import scala.reflect.NameTransformer import NameTransformer._ import scala.reflect.runtime.{universe => ru} +import scala.reflect.{ClassTag, classTag} import typechecker.DestructureTypes import scala.tools.util.StringOps.ojoin diff --git a/src/compiler/scala/tools/nsc/io/Pickler.scala b/src/compiler/scala/tools/nsc/io/Pickler.scala index 416b84eec6..48361cd157 100644 --- a/src/compiler/scala/tools/nsc/io/Pickler.scala +++ b/src/compiler/scala/tools/nsc/io/Pickler.scala @@ -4,6 +4,7 @@ import annotation.unchecked import Lexer._ import java.io.Writer import language.implicitConversions +import reflect.ClassTag /** An abstract class for writing and reading Scala objects to and * from a legible representation. The presesentation follows the following grammar: diff --git a/src/compiler/scala/tools/nsc/settings/MutableSettings.scala b/src/compiler/scala/tools/nsc/settings/MutableSettings.scala index 2e4aa270bc..c0d9a677e8 100644 --- a/src/compiler/scala/tools/nsc/settings/MutableSettings.scala +++ b/src/compiler/scala/tools/nsc/settings/MutableSettings.scala @@ -12,6 +12,7 @@ import io.{ AbstractFile, Path, PlainFile, VirtualDirectory } import scala.tools.util.StringOps import scala.collection.mutable.ListBuffer import scala.io.Source +import scala.reflect.{ ClassTag, classTag } /** A mutable Settings object. */ diff --git a/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala b/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala index 776d61af2f..9d6b4a589c 100644 --- a/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala +++ b/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala @@ -8,6 +8,7 @@ package typechecker import symtab.Flags._ import scala.collection.{ mutable, immutable } import scala.tools.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 932e4548ef..85b2039765 100644 --- a/src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala +++ b/src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala @@ -9,6 +9,7 @@ package typechecker import symtab.Flags._ import scala.collection.mutable import scala.ref.WeakReference +import scala.reflect.ArrayTag /** * @author Lukas Rytz diff --git a/src/compiler/scala/tools/nsc/util/ClassPath.scala b/src/compiler/scala/tools/nsc/util/ClassPath.scala index 472b5180b4..0636fcf581 100644 --- a/src/compiler/scala/tools/nsc/util/ClassPath.scala +++ b/src/compiler/scala/tools/nsc/util/ClassPath.scala @@ -11,6 +11,7 @@ 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.ClassTag import Jar.isJarOrZip import File.pathSeparator import java.net.MalformedURLException diff --git a/src/compiler/scala/tools/nsc/util/Position.scala b/src/compiler/scala/tools/nsc/util/Position.scala index b27ca17bfe..d07468e728 100644 --- a/src/compiler/scala/tools/nsc/util/Position.scala +++ b/src/compiler/scala/tools/nsc/util/Position.scala @@ -7,6 +7,7 @@ package scala.tools.nsc package util +import reflect.ClassTag import reflect.base.Attachments import reflect.api.PositionApi diff --git a/src/compiler/scala/tools/nsc/util/ScalaClassLoader.scala b/src/compiler/scala/tools/nsc/util/ScalaClassLoader.scala index 0f8c0755e0..5b30d9aacd 100644 --- a/src/compiler/scala/tools/nsc/util/ScalaClassLoader.scala +++ b/src/compiler/scala/tools/nsc/util/ScalaClassLoader.scala @@ -15,6 +15,7 @@ import scala.reflect.runtime.ReflectionUtils.unwrapHandler import ScalaClassLoader._ import scala.util.control.Exception.{ catching } import language.implicitConversions +import scala.reflect.{ ClassTag, classTag } trait HasClassPath { def classPathURLs: Seq[URL] diff --git a/src/compiler/scala/tools/reflect/FrontEnds.scala b/src/compiler/scala/tools/reflect/FrontEnds.scala index 52eadc4e04..0e4dbd406a 100644 --- a/src/compiler/scala/tools/reflect/FrontEnds.scala +++ b/src/compiler/scala/tools/reflect/FrontEnds.scala @@ -3,6 +3,7 @@ package reflect import scala.tools.nsc.reporters._ import scala.tools.nsc.Settings +import scala.reflect.ClassTag trait FrontEnds extends scala.reflect.api.FrontEnds { diff --git a/src/compiler/scala/tools/reflect/StdTags.scala b/src/compiler/scala/tools/reflect/StdTags.scala index f01e476273..c782181f21 100644 --- a/src/compiler/scala/tools/reflect/StdTags.scala +++ b/src/compiler/scala/tools/reflect/StdTags.scala @@ -2,6 +2,7 @@ package scala.tools package reflect import java.lang.{Class => jClass} +import scala.reflect.{ClassTag, classTag} import scala.reflect.base.{MirrorOf, TypeCreator, Universe => BaseUniverse} import scala.reflect.runtime.{universe => ru} |