diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2016-10-26 20:19:18 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2016-10-27 10:42:06 +0200 |
| commit | 26c57466eb321a053af0c0feaebf24e585a6bea4 (patch) | |
| tree | f2d666a9454c86b4e8dcee978628b078a72ca8af /src/reflect/scala/reflect/internal/pickling | |
| parent | 69fc725abf7690ea73a02f44f285d192491468b4 (diff) | |
| download | scala-26c57466eb321a053af0c0feaebf24e585a6bea4.tar.gz scala-26c57466eb321a053af0c0feaebf24e585a6bea4.tar.bz2 scala-26c57466eb321a053af0c0feaebf24e585a6bea4.zip | |
Minor style cleanups, no changes in logic
Diffstat (limited to 'src/reflect/scala/reflect/internal/pickling')
| -rw-r--r-- | src/reflect/scala/reflect/internal/pickling/UnPickler.scala | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/reflect/scala/reflect/internal/pickling/UnPickler.scala b/src/reflect/scala/reflect/internal/pickling/UnPickler.scala index c335bf0f47..016351c639 100644 --- a/src/reflect/scala/reflect/internal/pickling/UnPickler.scala +++ b/src/reflect/scala/reflect/internal/pickling/UnPickler.scala @@ -38,10 +38,6 @@ abstract class UnPickler { assert(classRoot != NoSymbol && moduleRoot != NoSymbol, s"The Unpickler expects a class and module symbol: $classRoot - $moduleRoot") new Scan(bytes, offset, classRoot, moduleRoot, filename).run() } catch { - case ex: IOException => - throw ex - case ex: MissingRequirementError => - throw ex case ex: Throwable => /*if (settings.debug.value)*/ ex.printStackTrace() throw new RuntimeException("error reading Scala signature of "+filename+": "+ex.getMessage()) @@ -355,9 +351,10 @@ abstract class UnPickler { sym case MODULEsym => - val clazz = at(inforef, () => readType()).typeSymbol // after NMT_TRANSITION, we can leave off the () => ... () + val moduleClass = at(inforef, () => readType()).typeSymbol // after NMT_TRANSITION, we can leave off the () => ... () if (isModuleRoot) moduleRoot setFlag pflags - else owner.newLinkedModule(clazz, pflags) + else owner.newLinkedModule(moduleClass, pflags) + case VALsym => if (isModuleRoot) { abort(s"VALsym at module root: owner = $owner, name = $name") } else owner.newTermSymbol(name.toTermName, NoPosition, pflags) |