diff options
| -rw-r--r-- | src/dotty/tools/dotc/core/pickling/ClassfileParser.scala | 4 | ||||
| -rw-r--r-- | src/dotty/tools/dotc/core/pickling/Scala2Unpickler.scala (renamed from src/dotty/tools/dotc/core/pickling/UnPickler.scala) | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/dotty/tools/dotc/core/pickling/ClassfileParser.scala b/src/dotty/tools/dotc/core/pickling/ClassfileParser.scala index 21c9aa84d..480fd968a 100644 --- a/src/dotty/tools/dotc/core/pickling/ClassfileParser.scala +++ b/src/dotty/tools/dotc/core/pickling/ClassfileParser.scala @@ -4,7 +4,7 @@ package core package pickling import Contexts._, Symbols._, Types._, Names._, StdNames._, NameOps._, Scopes._, Decorators._ -import SymDenotations._, UnPickler._, Constants._, Annotations._, util.Positions._ +import SymDenotations._, Scala2Unpickler._, Constants._, Annotations._, util.Positions._ import ast.tpd._ import java.io.{ File, IOException } import java.lang.Integer.toHexString @@ -665,7 +665,7 @@ class ClassfileParser( } def unpickleScala(bytes: Array[Byte]): Boolean = { - new UnPickler(bytes, classRoot, moduleRoot)(ctx).run() + new Scala2Unpickler(bytes, classRoot, moduleRoot)(ctx).run() true } diff --git a/src/dotty/tools/dotc/core/pickling/UnPickler.scala b/src/dotty/tools/dotc/core/pickling/Scala2Unpickler.scala index 3c3ec4a70..60fe28229 100644 --- a/src/dotty/tools/dotc/core/pickling/UnPickler.scala +++ b/src/dotty/tools/dotc/core/pickling/Scala2Unpickler.scala @@ -24,7 +24,7 @@ import scala.collection.{ mutable, immutable } import scala.collection.mutable.ListBuffer import scala.annotation.switch -object UnPickler { +object Scala2Unpickler { /** Exception thrown if classfile is corrupted */ class BadSignature(msg: String) extends RuntimeException(msg) @@ -147,7 +147,7 @@ object UnPickler { * @param moduleroot the top-level module class which is unpickled, or NoSymbol if inapplicable * @param filename filename associated with bytearray, only used for error messages */ -class UnPickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClassRoot: ClassDenotation)(ictx: Context) +class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClassRoot: ClassDenotation)(ictx: Context) extends PickleBuffer(bytes, 0, -1) { def showPickled() = { @@ -159,7 +159,7 @@ class UnPickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClassRoot: // print("unpickling "); showPickled() // !!! DEBUG - import UnPickler._ + import Scala2Unpickler._ val moduleRoot = moduleClassRoot.sourceModule(ictx).denot(ictx) assert(moduleRoot.isTerm) |