diff options
author | Martin Odersky <odersky@gmail.com> | 2014-01-25 13:03:38 +0100 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2014-01-26 18:52:33 +0100 |
commit | b2dd6a8a67a70783e68da1f33c33f18c6641e5bb (patch) | |
tree | e80111b0827d47079fe23b9dfa939f2f25f20da9 /src/dotty/tools/dotc/util/ShowPickled.scala | |
parent | 1c68b24b79735f88a34c3490df87cc143fa8b7af (diff) | |
download | dotty-b2dd6a8a67a70783e68da1f33c33f18c6641e5bb.tar.gz dotty-b2dd6a8a67a70783e68da1f33c33f18c6641e5bb.tar.bz2 dotty-b2dd6a8a67a70783e68da1f33c33f18c6641e5bb.zip |
Update to 2.11
Previous flagsString is no longer accessible. Have to use Dotty's mechanism to show flags,
Diffstat (limited to 'src/dotty/tools/dotc/util/ShowPickled.scala')
-rw-r--r-- | src/dotty/tools/dotc/util/ShowPickled.scala | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/dotty/tools/dotc/util/ShowPickled.scala b/src/dotty/tools/dotc/util/ShowPickled.scala index 71c48042c..92ce44bc6 100644 --- a/src/dotty/tools/dotc/util/ShowPickled.scala +++ b/src/dotty/tools/dotc/util/ShowPickled.scala @@ -138,7 +138,7 @@ object ShowPickled { def printConstAnnotArgRef() = printNat() def printAnnotArgRef() = printNat() - def printSymInfo(end: Int): Unit = { + def printSymInfo(end: Int, isType: Boolean): Unit = { printNameRef() printSymbolRef() val pflags = buf.readLongNat() @@ -149,14 +149,7 @@ object ShowPickled { idx + "(" + s + ")" } ) - val flagString = { - val arg1 = Flags.pickledToRawFlags(pflags) - accessBoundary match { - case Some(pw) => Flags.flagsToString(arg1, pw) - case _ => Flags.flagsToString(arg1) - } - } - + val flagString = buf.unpickleScalaFlags(pflags, isType).toString out.print(" %s[%s]".format(toHexString(pflags), flagString)) } @@ -194,7 +187,7 @@ object ShowPickled { out.print(typeName(buf.bytes, buf.readIndex, len)) buf.readIndex = end case TYPEsym | ALIASsym | CLASSsym | MODULEsym | VALsym => - printSymInfo(end) + printSymInfo(end, tag == TYPEsym || tag == ALIASsym || tag == CLASSsym) if (tag == CLASSsym && (buf.readIndex < end)) printTypeRef() case EXTref | EXTMODCLASSref => printNameRef() |