Merge pull request #4909 from dotty-staging/fix-tasty-reflect-any-and-nothing-defs

Fix TASTy reflect Any and Nothing definitions

Author: nicolasstucki

compiler/src/dotty/tools/dotc/tastyreflect/FromSymbol.scala

@@ -11,8 +11,6 @@ object FromSymbol {
 
   def definitionFromSym(sym: Symbol)(implicit ctx: Context): tpd.Tree = {
     if (sym.is(Package)) packageDefFromSym(sym)
-    else if (sym == defn.AnyClass) tpd.EmptyTree // FIXME
-    else if (sym == defn.NothingClass) tpd.EmptyTree // FIXME
     else if (sym.isClass) classDef(sym.asClass)
     else if (sym.isType) typeDefFromSym(sym.asType)
     else if (sym.is(Method)) defDefFromSym(sym.asTerm)

library/src/scala/tasty/util/ShowExtractors.scala

@@ -166,7 +166,6 @@ class ShowExtractors[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
           case TypeDef(name, _) => this += "TypeDef(\"" += name += "\", _)"
           case ClassDef(name, _, _, _, _) => this += "ClassDef(\"" += name += "\", _, _, _, _)"
           case PackageDef(name, _) => this += "PackageDef(\"" += name += "\", _)"
-          case _ => this += "#"
         }
         this += "Type.SymRef("
         visitName(sym)

tests/run/tasty-definitions.check

@@ -163,9 +163,9 @@ Type.SymRef(ClassDef("Long", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("
 Type.SymRef(ClassDef("Float", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))
 Type.SymRef(ClassDef("Double", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))
 Type.SymRef(ClassDef("Boolean", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))
-Type.SymRef(#, Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))
+Type.SymRef(ClassDef("Any", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))
 Type.SymRef(ClassDef("AnyVal", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))
 Type.SymRef(TypeDef("AnyRef", _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))
 Type.SymRef(ClassDef("Object", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("lang", _), NoPrefix())))
-Type.SymRef(#, Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))
+Type.SymRef(ClassDef("Nothing", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))
 Type.SymRef(ClassDef("Null", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))

tests/run/tasty-extractors-3.check

@@ -2,11 +2,11 @@ Type.SymRef(ClassDef("Int", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("s
 
 Type.SymRef(ValDef("x", _, _), NoPrefix())
 
-TypeBounds(Type.SymRef(#, Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))), Type.SymRef(#, Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))))
+TypeBounds(Type.SymRef(ClassDef("Nothing", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))), Type.SymRef(ClassDef("Any", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))))
 
-Type.SymRef(#, Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))
+Type.SymRef(ClassDef("Nothing", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))
 
-Type.SymRef(#, Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))
+Type.SymRef(ClassDef("Any", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))
 
 Type.SymRef(TypeDef("T", _), NoPrefix())
 
@@ -22,11 +22,11 @@ Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("
 
 Type.SymRef(ClassDef("Object", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("lang", _), NoPrefix())))
 
-TypeBounds(Type.SymRef(#, Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))), Type.SymRef(#, Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))))
+TypeBounds(Type.SymRef(ClassDef("Nothing", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))), Type.SymRef(ClassDef("Any", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))))
 
-Type.SymRef(#, Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))
+Type.SymRef(ClassDef("Nothing", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))
 
-Type.SymRef(#, Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))
+Type.SymRef(ClassDef("Any", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))
 
 Type.Refinement(Type.SymRef(ClassDef("Foo", _, _, _, _), NoPrefix()), X, TypeBounds(Type.SymRef(TypeDef("String", _), Type.SymRef(ValDef("Predef", _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))), Type.SymRef(TypeDef("String", _), Type.SymRef(ValDef("Predef", _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))))))