Print annotation in decompiler #4676
Conversation
nicolasstucki
force-pushed
the
fix-decompiler-annots
branch
from
6604693 to
66fea8b
Compare
| printType(tree.tpe) | ||
| case tree @ Term.Ident(name) => | ||
| tree.tpe match { | ||
| case Type.SymRef(_, Types.EmptyPrefix()) | Type.TermRef(_, Types.EmptyPrefix()) => this += name |
There was a problem hiding this comment.
It seems SymRef subsumes TermRef?
There was a problem hiding this comment.
No, both are core.Types.NamedTypes but SymRef as a symbol as designator and TermRef has a TermName as designator.
| @@ -768,13 +800,35 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty | |||
| } | |||
|
|
|||
| def printDefinitionName(sym: Definition): Buffer = sym match { | |||
| case ValDef(name, _, _) => this += name | |||
| case ValDef(name, _, _) => this += name += ".type" | |||
There was a problem hiding this comment.
I'm trying to figure out how to print (x: @annot), the issue is that it gets expanded to something like (x: x @annot). I was trying to workaround it by printing (x: x.type @annot) instead. I will now try to print it as (x: @annot) as it was originally.
nicolasstucki
force-pushed
the
fix-decompiler-annots
branch
from
66fea8b to
c5ff0b2
Compare
|
@liufengyun could you review the changes in the last commit |
|
@liufengyun last 2 commits |
| this += ".type" | ||
| case tpe => printType(tpe) | ||
| } | ||
| printTypeAndAnnots(tree.tpe) |
There was a problem hiding this comment.
tests/run-with-compiler/i3947c.scala failed due to the change, I cannot figure out why.
There was a problem hiding this comment.
It was because scala.runtime.Null$ and scala.runtime.Nothing$ where handled as modules. Those are now special cases.
nicolasstucki
force-pushed
the
fix-decompiler-annots
branch
from
7fa5814 to
40fffc1
Compare
No description provided.