diff options
-rw-r--r-- | src/compiler/scala/reflect/internal/AnnotationInfos.scala | 3 | ||||
-rw-r--r-- | src/compiler/scala/reflect/internal/ByteCodecs.scala (renamed from src/library/scala/reflect/generic/ByteCodecs.scala) | 2 | ||||
-rw-r--r-- | src/compiler/scala/tools/nsc/Global.scala | 10 | ||||
-rw-r--r-- | src/scalap/scala/tools/scalap/Decode.scala | 2 | ||||
-rw-r--r-- | src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSig.scala | 2 |
5 files changed, 9 insertions, 10 deletions
diff --git a/src/compiler/scala/reflect/internal/AnnotationInfos.scala b/src/compiler/scala/reflect/internal/AnnotationInfos.scala index 7ca7d5c902..1da867a6b6 100644 --- a/src/compiler/scala/reflect/internal/AnnotationInfos.scala +++ b/src/compiler/scala/reflect/internal/AnnotationInfos.scala @@ -41,8 +41,7 @@ trait AnnotationInfos /*extends reflect.generic.AnnotationInfos*/ { self: Symbol * reasons of efficiency, both in term of class-file size and in term of compiler performance. */ case class ScalaSigBytes(bytes: Array[Byte]) extends ClassfileAnnotArg { override def toString = (bytes map { byte => (byte & 0xff).toHexString }).mkString("[ ", " ", " ]") - lazy val encodedBytes = - reflect.generic.ByteCodecs.encode(bytes) + lazy val encodedBytes = ByteCodecs.encode(bytes) def isLong: Boolean = (encodedBytes.length > 65535) def sigAnnot: Type = if (this.isLong) diff --git a/src/library/scala/reflect/generic/ByteCodecs.scala b/src/compiler/scala/reflect/internal/ByteCodecs.scala index 8993e068d9..8b0fc9300a 100644 --- a/src/library/scala/reflect/generic/ByteCodecs.scala +++ b/src/compiler/scala/reflect/internal/ByteCodecs.scala @@ -5,7 +5,7 @@ ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ -package scala.reflect.generic +package scala.reflect.internal object ByteCodecs { diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala index 36f6b315c2..e2c53b9676 100644 --- a/src/compiler/scala/tools/nsc/Global.scala +++ b/src/compiler/scala/tools/nsc/Global.scala @@ -1232,20 +1232,20 @@ class Global(var currentSettings: Settings, var reporter: Reporter) extends Symb } } - /** Returns the file with the given suffix for the given class. Used for icode writing. */ - def getFile(clazz: Symbol, suffix: String): File = { + def getFile(source: AbstractFile, segments: Array[String], suffix: String): File = { val outDir = Path( - settings.outputDirs.outputDirFor(clazz.sourceFile).path match { + settings.outputDirs.outputDirFor(source).path match { case "" => "." case path => path } ) - val segments = clazz.fullName split '.' val dir = segments.init.foldLeft(outDir)(_ / _).createDirectory() - new File(dir.path, segments.last + suffix) } + /** Returns the file with the given suffix for the given class. Used for icode writing. */ + def getFile(clazz: Symbol, suffix: String): File = getFile(clazz.sourceFile, clazz.fullName split '.', suffix) + private def writeICode() { val printer = new icodes.TextPrinter(null, icodes.linearizer) icodes.classes.values.foreach((cls) => { diff --git a/src/scalap/scala/tools/scalap/Decode.scala b/src/scalap/scala/tools/scalap/Decode.scala index 816041720f..53072189cd 100644 --- a/src/scalap/scala/tools/scalap/Decode.scala +++ b/src/scalap/scala/tools/scalap/Decode.scala @@ -12,7 +12,7 @@ package scala.tools.scalap import scala.tools.scalap.scalax.rules.scalasig._ import scala.tools.nsc.util.ScalaClassLoader import scala.tools.nsc.util.ScalaClassLoader.getSystemLoader -import scala.reflect.generic.ByteCodecs +import scala.reflect.internal.ByteCodecs import ClassFileParser.{ ConstValueIndex, Annotation } import Main.{ SCALA_SIG, SCALA_SIG_ANNOTATION, BYTES_VALUE } 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 f13192f267..5c4f18a573 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSig.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSig.scala @@ -12,7 +12,7 @@ package rules package scalasig import ClassFileParser.{ ConstValueIndex, Annotation } -import scala.reflect.generic.ByteCodecs +import scala.reflect.internal.ByteCodecs object ScalaSigParser { import Main.{ SCALA_SIG, SCALA_SIG_ANNOTATION, BYTES_VALUE } |