Use Symbols instead of Definitions in StandardDefinitions

Author: nicolasstucki

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

@@ -11,8 +11,6 @@ trait StandardDefinitions extends scala.tasty.reflect.StandardDefinitions {
 
   val definitions: DefinitionsApi = new DefinitionsApi {
 
-    // TODO return Symbols instead of Definitions
-
     def RootPackage: Symbol = defn.RootPackage
     def RootClass: Symbol = defn.RootClass
 
@@ -21,50 +19,50 @@ trait StandardDefinitions extends scala.tasty.reflect.StandardDefinitions {
     def ScalaPackage: Symbol = defn.ScalaPackageVal
     def ScalaPackageClass: Symbol = defn.ScalaPackageClass
 
-    def AnyClass: ClassDef = classDef(defn.AnyClass)
-    def AnyValClass: ClassDef = classDef(defn.AnyValClass)
-    def ObjectClass: ClassDef = classDef(defn.ObjectClass)
-    def AnyRefClass: TypeDef = typeDefFromSym(defn.AnyRefAlias)
-    def NullClass: ClassDef = classDef(defn.AnyClass)
-    def NothingClass: ClassDef = classDef(defn.NothingClass)
-    def UnitClass: ClassDef = classDef(defn.UnitClass)
-    def ByteClass: ClassDef = classDef(defn.ByteClass)
-    def ShortClass: ClassDef = classDef(defn.ShortClass)
-    def CharClass: ClassDef = classDef(defn.CharClass)
-    def IntClass: ClassDef = classDef(defn.IntClass)
-    def LongClass: ClassDef = classDef(defn.LongClass)
-    def FloatClass: ClassDef = classDef(defn.FloatClass)
-    def DoubleClass: ClassDef = classDef(defn.DoubleClass)
-    def BooleanClass: ClassDef = classDef(defn.BooleanClass)
-    def StringClass: ClassDef = classDef(defn.StringClass)
-    def ClassClass: ClassDef = classDef(defn.ClassClass)
-    def ArrayClass: ClassDef = classDef(defn.ArrayClass)
-    def PredefModule: ValDef = valDefFromSym(defn.ScalaPredefModule.asTerm)
-
-    def JavaLangPackage: PackageDef = packageDefFromSym(defn.JavaLangPackageVal)
-
-    def ArrayModule: ValDef = valDefFromSym(defn.ArrayClass.companionModule.asTerm)
-
-    def Array_apply: DefDef = defDefFromSym(defn.Array_apply.asTerm)
-    def Array_clone: DefDef = defDefFromSym(defn.Array_clone.asTerm)
-    def Array_length: DefDef = defDefFromSym(defn.Array_length.asTerm)
-    def Array_update: DefDef = defDefFromSym(defn.Array_update.asTerm)
+    def AnyClass: Symbol = defn.AnyClass
+    def AnyValClass: Symbol = defn.AnyValClass
+    def ObjectClass: Symbol = defn.ObjectClass
+    def AnyRefClass: Symbol = defn.AnyRefAlias
+    def NullClass: Symbol = defn.AnyClass
+    def NothingClass: Symbol = defn.NothingClass
+    def UnitClass: Symbol = defn.UnitClass
+    def ByteClass: Symbol = defn.ByteClass
+    def ShortClass: Symbol = defn.ShortClass
+    def CharClass: Symbol = defn.CharClass
+    def IntClass: Symbol = defn.IntClass
+    def LongClass: Symbol = defn.LongClass
+    def FloatClass: Symbol = defn.FloatClass
+    def DoubleClass: Symbol = defn.DoubleClass
+    def BooleanClass: Symbol = defn.BooleanClass
+    def StringClass: Symbol = defn.StringClass
+    def ClassClass: Symbol = defn.ClassClass
+    def ArrayClass: Symbol = defn.ArrayClass
+    def PredefModule: Symbol = defn.ScalaPredefModule.asTerm
+
+    def JavaLangPackage: Symbol = defn.JavaLangPackageVal
+
+    def ArrayModule: Symbol = defn.ArrayClass.companionModule.asTerm
+
+    def Array_apply: Symbol = defn.Array_apply.asTerm
+    def Array_clone: Symbol = defn.Array_clone.asTerm
+    def Array_length: Symbol = defn.Array_length.asTerm
+    def Array_update: Symbol = defn.Array_update.asTerm
 
     def RepeatedParamClass: Symbol = defn.RepeatedParamClass
 
-    def OptionClass: TypeDef = classDef(defn.OptionClass)
-    def NoneModule: ValDef = valDefFromSym(defn.NoneClass.companionModule.asTerm)
-    def SomeModule: ValDef = valDefFromSym(defn.SomeClass.companionModule.asTerm)
+    def OptionClass: Symbol = defn.OptionClass
+    def NoneModule: Symbol = defn.NoneClass.companionModule.asTerm
+    def SomeModule: Symbol = defn.SomeClass.companionModule.asTerm
 
-    def ProductClass: ClassDef = classDef(defn.ProductClass)
-    def FunctionClass(arity: Int, isImplicit: Boolean = false, isErased: Boolean = false): ClassDef =
-      classDef(defn.FunctionClass(arity, isImplicit, isErased).asClass)
-    def TupleClass(arity: Int): ClassDef = classDef(defn.TupleType(arity).classSymbol.asClass)
+    def ProductClass: Symbol = defn.ProductClass
+    def FunctionClass(arity: Int, isImplicit: Boolean = false, isErased: Boolean = false): Symbol =
+      defn.FunctionClass(arity, isImplicit, isErased).asClass
+    def TupleClass(arity: Int): Symbol = defn.TupleType(arity).classSymbol.asClass
 
 
-    def ScalaPrimitiveValueClasses: List[ClassDef] =
+    def ScalaPrimitiveValueClasses: List[Symbol] =
       UnitClass :: BooleanClass :: ScalaNumericValueClasses
-    def ScalaNumericValueClasses: List[ClassDef] =
+    def ScalaNumericValueClasses: List[Symbol] =
       ByteClass :: ShortClass :: IntClass :: LongClass :: FloatClass :: DoubleClass :: CharClass :: Nil
 
     def UnitType: Type = defn.UnitType

library/src/scala/tasty/reflect/StandardDefinitions.scala

@@ -29,104 +29,104 @@ trait StandardDefinitions extends TastyCore {
     def ScalaPackageClass: Symbol
 
     /** The class symbol of core class `scala.Any`. */
-    def AnyClass   : ClassDef
+    def AnyClass: Symbol
 
     /** The class symbol of core class `scala.AnyVal`. */
-    def AnyValClass: ClassDef
+    def AnyValClass: Symbol
 
     /** The class symbol of core class `java.lang.Object`. */
-    def ObjectClass: ClassDef
+    def ObjectClass: Symbol
 
     /** The type symbol of core class `scala.AnyRef`. */
-    def AnyRefClass: TypeDef
+    def AnyRefClass: Symbol
 
     /** The class symbol of core class `scala.Null`. */
-    def NullClass   : ClassDef
+    def NullClass: Symbol
 
     /** The class symbol of core class `scala.Nothing`. */
-    def NothingClass: ClassDef
+    def NothingClass: Symbol
 
     /** The class symbol of primitive class `scala.Unit`. */
-    def UnitClass   : ClassDef
+    def UnitClass: Symbol
 
     /** The class symbol of primitive class `scala.Byte`. */
-    def ByteClass   : ClassDef
+    def ByteClass: Symbol
 
     /** The class symbol of primitive class `scala.Short`. */
-    def ShortClass  : ClassDef
+    def ShortClass: Symbol
 
     /** The class symbol of primitive class `scala.Char`. */
-    def CharClass   : ClassDef
+    def CharClass: Symbol
 
     /** The class symbol of primitive class `scala.Int`. */
-    def IntClass    : ClassDef
+    def IntClass: Symbol
 
     /** The class symbol of primitive class `scala.Long`. */
-    def LongClass   : ClassDef
+    def LongClass: Symbol
 
     /** The class symbol of primitive class `scala.Float`. */
-    def FloatClass  : ClassDef
+    def FloatClass: Symbol
 
     /** The class symbol of primitive class `scala.Double`. */
-    def DoubleClass : ClassDef
+    def DoubleClass: Symbol
 
     /** The class symbol of primitive class `scala.Boolean`. */
-    def BooleanClass: ClassDef
+    def BooleanClass: Symbol
 
     /** The class symbol of class `scala.String`. */
-    def StringClass : ClassDef
+    def StringClass: Symbol
 
     /** The class symbol of class `java.lang.Class`. */
-    def ClassClass  : ClassDef
+    def ClassClass: Symbol
 
     /** The class symbol of class `scala.Array`. */
-    def ArrayClass  : ClassDef
+    def ArrayClass: Symbol
 
     /** The module symbol of module `scala.Predef`. */
-    def PredefModule: ValDef
+    def PredefModule: Symbol
 
     /** The module symbol of package `java.lang`. */
-    def JavaLangPackage: PackageDef
+    def JavaLangPackage: Symbol
 
     /** The module symbol of module `scala.Array`. */
-    def ArrayModule: ValDef
+    def ArrayModule: Symbol
 
     /** The method symbol of method `apply` in class `scala.Array`. */
-    def Array_apply: DefDef
+    def Array_apply: Symbol
 
     /** The method symbol of method `clone` in class `scala.Array`. */
-    def Array_clone: DefDef
+    def Array_clone: Symbol
 
     /** The method symbol of method `length` in class `scala.Array`. */
-    def Array_length: DefDef
+    def Array_length: Symbol
 
     /** The method symbol of method `update` in class `scala.Array`. */
-    def Array_update: DefDef
+    def Array_update: Symbol
 
     /** A dummy class symbol that is used to indicate repeated parameters
       *  compiled by the Scala compiler.
       */
     def RepeatedParamClass: Symbol
 
     /** The class symbol of class `scala.Option`. */
-    def OptionClass: ClassDef
+    def OptionClass: Symbol
 
     /** The module symbol of module `scala.None`. */
-    def NoneModule: ValDef
+    def NoneModule: Symbol
 
     /** The module symbol of module `scala.Some`. */
-    def SomeModule: ValDef
+    def SomeModule: Symbol
 
     /** Function-like object that maps arity to symbols for classes `scala.Product` */
-    def ProductClass: ClassDef
+    def ProductClass: Symbol
 
     /** Function-like object that maps arity to symbols for classes `scala.FunctionX`.
       *   -  0th element is `Function0`
       *   -  1st element is `Function1`
       *   -  ...
       *   -  Nth element is `FunctionN`
       */
-    def FunctionClass(arity: Int, isImplicit: Boolean = false, isErased: Boolean = false): ClassDef
+    def FunctionClass(arity: Int, isImplicit: Boolean = false, isErased: Boolean = false): Symbol
 
     /** Function-like object that maps arity to symbols for classes `scala.TupleX`.
       *   -  0th element is `NoSymbol`
@@ -137,7 +137,7 @@ trait StandardDefinitions extends TastyCore {
       *   - 23nd element is `NoSymbol`  // TODO update when we will have more tuples
       *   - ...
       */
-    def TupleClass(arity: Int): ClassDef
+    def TupleClass(arity: Int): Symbol
 
     /** Contains Scala primitive value classes:
       *   - Byte
@@ -150,7 +150,7 @@ trait StandardDefinitions extends TastyCore {
       *   - Boolean
       *   - Unit
       */
-    def ScalaPrimitiveValueClasses: List[ClassDef]
+    def ScalaPrimitiveValueClasses: List[Symbol]
 
     /** Contains Scala numeric value classes:
       *   - Byte
@@ -161,7 +161,7 @@ trait StandardDefinitions extends TastyCore {
       *   - Double
       *   - Char
       */
-    def ScalaNumericValueClasses: List[ClassDef]
+    def ScalaNumericValueClasses: List[Symbol]
   }
 
   /** Defines standard types.