Skip to content

Commit d3b3192

Browse files
Merge pull request #4909 from dotty-staging/fix-tasty-reflect-any-and-nothing-defs
Fix TASTy reflect Any and Nothing definitions
2 parents 2e4c2ad + 3b5651c commit d3b3192

File tree

4 files changed

+8
-11
lines changed

4 files changed

+8
-11
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ object FromSymbol {
1111

1212
def definitionFromSym(sym: Symbol)(implicit ctx: Context): tpd.Tree = {
1313
if (sym.is(Package)) packageDefFromSym(sym)
14-
else if (sym == defn.AnyClass) tpd.EmptyTree // FIXME
15-
else if (sym == defn.NothingClass) tpd.EmptyTree // FIXME
1614
else if (sym.isClass) classDef(sym.asClass)
1715
else if (sym.isType) typeDefFromSym(sym.asType)
1816
else if (sym.is(Method)) defDefFromSym(sym.asTerm)

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ class ShowExtractors[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
166166
case TypeDef(name, _) => this += "TypeDef(\"" += name += "\", _)"
167167
case ClassDef(name, _, _, _, _) => this += "ClassDef(\"" += name += "\", _, _, _, _)"
168168
case PackageDef(name, _) => this += "PackageDef(\"" += name += "\", _)"
169-
case _ => this += "#"
170169
}
171170
this += "Type.SymRef("
172171
visitName(sym)

tests/run/tasty-definitions.check

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,9 @@ Type.SymRef(ClassDef("Long", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("
163163
Type.SymRef(ClassDef("Float", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))
164164
Type.SymRef(ClassDef("Double", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))
165165
Type.SymRef(ClassDef("Boolean", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))
166-
Type.SymRef(#, Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))
166+
Type.SymRef(ClassDef("Any", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))
167167
Type.SymRef(ClassDef("AnyVal", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))
168168
Type.SymRef(TypeDef("AnyRef", _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))
169169
Type.SymRef(ClassDef("Object", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("lang", _), NoPrefix())))
170-
Type.SymRef(#, Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))
170+
Type.SymRef(ClassDef("Nothing", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))
171171
Type.SymRef(ClassDef("Null", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))

tests/run/tasty-extractors-3.check

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ Type.SymRef(ClassDef("Int", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("s
22

33
Type.SymRef(ValDef("x", _, _), NoPrefix())
44

5-
TypeBounds(Type.SymRef(#, Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))), Type.SymRef(#, Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))))
5+
TypeBounds(Type.SymRef(ClassDef("Nothing", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))), Type.SymRef(ClassDef("Any", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))))
66

7-
Type.SymRef(#, Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))
7+
Type.SymRef(ClassDef("Nothing", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))
88

9-
Type.SymRef(#, Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))
9+
Type.SymRef(ClassDef("Any", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))
1010

1111
Type.SymRef(TypeDef("T", _), NoPrefix())
1212

@@ -22,11 +22,11 @@ Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("
2222

2323
Type.SymRef(ClassDef("Object", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("lang", _), NoPrefix())))
2424

25-
TypeBounds(Type.SymRef(#, Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))), Type.SymRef(#, Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))))
25+
TypeBounds(Type.SymRef(ClassDef("Nothing", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))), Type.SymRef(ClassDef("Any", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))))
2626

27-
Type.SymRef(#, Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))
27+
Type.SymRef(ClassDef("Nothing", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))
2828

29-
Type.SymRef(#, Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))
29+
Type.SymRef(ClassDef("Any", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))
3030

3131
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()))))))
3232

0 commit comments

Comments
 (0)