diff options
author | Paul Phillips <paulp@improving.org> | 2011-11-03 04:51:52 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-11-03 04:51:52 +0000 |
commit | 938eab16f841fee67b2e34c983a7a2a6a5998127 (patch) | |
tree | 0c576763abf934891b519c61dfe5889541955f71 /src/scalap | |
parent | b6778be91900b8161e705dc2598ef7af86842b0b (diff) | |
download | scala-938eab16f841fee67b2e34c983a7a2a6a5998127.tar.gz scala-938eab16f841fee67b2e34c983a7a2a6a5998127.tar.bz2 scala-938eab16f841fee67b2e34c983a7a2a6a5998127.zip |
ScalaClassLoader changes.
Lots of fiddling in the interests of a better classloading future.
Diffstat (limited to 'src/scalap')
-rw-r--r-- | src/scalap/scala/tools/scalap/Decode.scala | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/scalap/scala/tools/scalap/Decode.scala b/src/scalap/scala/tools/scalap/Decode.scala index b4f93bccd4..4e12075541 100644 --- a/src/scalap/scala/tools/scalap/Decode.scala +++ b/src/scalap/scala/tools/scalap/Decode.scala @@ -11,7 +11,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.tools.nsc.util.ScalaClassLoader.appLoader import scala.reflect.internal.pickling.ByteCodecs import ClassFileParser.{ ConstValueIndex, Annotation } @@ -31,7 +31,7 @@ object Decode { /** Return the classfile bytes representing the scala sig classfile attribute. * This has been obsoleted by the switch to annotations. */ - def scalaSigBytes(name: String): Option[Array[Byte]] = scalaSigBytes(name, getSystemLoader()) + def scalaSigBytes(name: String): Option[Array[Byte]] = scalaSigBytes(name, appLoader) def scalaSigBytes(name: String, classLoader: ScalaClassLoader): Option[Array[Byte]] = { val bytes = classLoader.classBytes(name) val reader = new ByteArrayReader(bytes) @@ -41,7 +41,7 @@ object Decode { /** Return the bytes representing the annotation */ - def scalaSigAnnotationBytes(name: String): Option[Array[Byte]] = scalaSigAnnotationBytes(name, getSystemLoader()) + def scalaSigAnnotationBytes(name: String): Option[Array[Byte]] = scalaSigAnnotationBytes(name, appLoader) def scalaSigAnnotationBytes(name: String, classLoader: ScalaClassLoader): Option[Array[Byte]] = { val bytes = classLoader.classBytes(name) val byteCode = ByteCode(bytes) @@ -67,7 +67,7 @@ object Decode { } for { - clazz <- getSystemLoader.tryToLoadClass[AnyRef](outer) + clazz <- appLoader.tryToLoadClass[AnyRef](outer) ssig <- ScalaSigParser.parse(clazz) } yield { @@ -89,7 +89,7 @@ object Decode { */ private[scala] def typeAliases(pkg: String) = { for { - clazz <- getSystemLoader.tryToLoadClass[AnyRef](pkg + ".package") + clazz <- appLoader.tryToLoadClass[AnyRef](pkg + ".package") ssig <- ScalaSigParser.parse(clazz) } yield { |