diff options
author | Lukas Rytz <lukas.rytz@gmail.com> | 2016-10-28 12:43:47 +0200 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@gmail.com> | 2016-10-28 12:43:47 +0200 |
commit | 795d59a8f600e45ee9b05b483a4d80d2d8ce6de5 (patch) | |
tree | 3f533e3a00006a73f7a33b3372d10af458100de5 /src/reflect/scala/reflect/runtime/SymbolLoaders.scala | |
parent | ae17256f1dcde4dd82008c6e355604d68d5a07b3 (diff) | |
download | scala-795d59a8f600e45ee9b05b483a4d80d2d8ce6de5.tar.gz scala-795d59a8f600e45ee9b05b483a4d80d2d8ce6de5.tar.bz2 scala-795d59a8f600e45ee9b05b483a4d80d2d8ce6de5.zip |
Address review comments
Tighten some types (Symbol -> ClassSymbol / ModuleSymbol), use NonFatal
instead of catching Throwable.
Also don't run the classfile parser enteringPhase(phaseBeforeRefchecks)
anymore. This was added in 0ccdb15 but seems no longer required.
Diffstat (limited to 'src/reflect/scala/reflect/runtime/SymbolLoaders.scala')
-rw-r--r-- | src/reflect/scala/reflect/runtime/SymbolLoaders.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/reflect/scala/reflect/runtime/SymbolLoaders.scala b/src/reflect/scala/reflect/runtime/SymbolLoaders.scala index 768a3d5ce5..3f2864ee7b 100644 --- a/src/reflect/scala/reflect/runtime/SymbolLoaders.scala +++ b/src/reflect/scala/reflect/runtime/SymbolLoaders.scala @@ -14,7 +14,7 @@ private[reflect] trait SymbolLoaders { self: SymbolTable => * by unpickling information from the corresponding Java class. If no Java class * is found, a package is created instead. */ - class TopClassCompleter(clazz: Symbol, module: Symbol) extends SymLoader with FlagAssigningCompleter { + class TopClassCompleter(clazz: ClassSymbol, module: ModuleSymbol) extends SymLoader with FlagAssigningCompleter { markFlagsCompleted(clazz, module)(mask = ~TopLevelPickledFlags) override def complete(sym: Symbol) = { debugInfo("completing "+sym+"/"+clazz.fullName) @@ -36,7 +36,7 @@ private[reflect] trait SymbolLoaders { self: SymbolTable => * @param name The simple name of the newly created class * @param completer The completer to be used to set the info of the class and the module */ - protected def initAndEnterClassAndModule(owner: Symbol, name: TypeName, completer: (Symbol, Symbol) => LazyType) = { + protected def initAndEnterClassAndModule(owner: Symbol, name: TypeName, completer: (ClassSymbol, ModuleSymbol) => LazyType) = { assert(!(name.toString endsWith "[]"), name) val clazz = owner.newClass(name) val module = owner.newModule(name.toTermName) |