diff options
Diffstat (limited to 'src/dotty')
| -rw-r--r-- | src/dotty/tools/dotc/typer/Implicits.scala | 2 | ||||
| -rw-r--r-- | src/dotty/tools/dotc/util/ShowPickled.scala | 13 |
2 files changed, 4 insertions, 11 deletions
diff --git a/src/dotty/tools/dotc/typer/Implicits.scala b/src/dotty/tools/dotc/typer/Implicits.scala index 10ba90055..397ebec53 100644 --- a/src/dotty/tools/dotc/typer/Implicits.scala +++ b/src/dotty/tools/dotc/typer/Implicits.scala @@ -373,7 +373,7 @@ trait Implicits { self: Typer => if (ctx.typerState.reporter.hasErrors) nonMatchingImplicit(ref) else if (contextual && !shadowing.tpe.isError && !refMatches(shadowing)) { - println(i"SHADOWING $ref is shadowed by $shadowing") + implicits.println(i"SHADOWING $ref is shadowed by $shadowing") shadowedImplicit(ref, methPart(shadowing).tpe) } else 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() |