Merge pull request #6193 from dotty-staging/flatten-term-type-tree-modules

Flatten term type tree modules

Author: nicolasstucki

docs/docs/reference/other-new-features/tasty-reflect.md

@@ -119,7 +119,7 @@ TASTy Reflect provides the following types:
          +- TypeTree ----+- Inferred
          |               +- TypeIdent
          |               +- TypeSelect
-         |               +- Project
+         |               +- Projection
          |               +- Singleton
          |               +- Refined
          |               +- Applied

library/src-bootstrapped/scala/tasty/reflect/utils/TreeUtils.scala

@@ -9,14 +9,14 @@ trait TreeUtils {
   import reflect._
 
   /** Bind the `rhs` to a `val` and use it in `body` */
-  def let(rhs: Term)(body: Term.Ident => Term): Term = {
+  def let(rhs: Term)(body: Ident => Term): Term = {
     type T // TODO probably it is better to use the Sealed contruct rather than let the user create their own existential type
     implicit val rhsTpe: quoted.Type[T] = rhs.tpe.seal.asInstanceOf[quoted.Type[T]]
     val rhsExpr = rhs.seal[T]
     val expr = '{
       val x = $rhsExpr
       ${
-        val id = ('x).unseal.asInstanceOf[Term.Ident]
+        val id = ('x).unseal.asInstanceOf[Ident]
         body(id).seal[Any]
       }
     }

library/src-non-bootstrapped/scala/tasty/reflect/utils/TreeUtils.scala

@@ -7,7 +7,7 @@ trait TreeUtils {
   import reflect._
 
   /** Bind the `rhs` to a `val` and use it in `body` */
-  def let(rhs: Term)(bodyType: Type)(body: Term.Ident => Term): Term =
+  def let(rhs: Term)(bodyType: Type)(body: Ident => Term): Term =
     throw new Exception("non bootstrpped lib")
 
 }

library/src/scala/tasty/reflect/Core.scala

@@ -41,7 +41,7 @@ package scala.tasty.reflect
  *           +- TypeTree ----+- Inferred
  *           |               +- TypeIdent
  *           |               +- TypeSelect
- *           |               +- Project
+ *           |               +- Projection
  *           |               +- Singleton
  *           |               +- Refined
  *           |               +- Applied
@@ -160,12 +160,6 @@ trait Core {
       /** Tree representing an expression in the source code */
       type Term = kernel.Term
 
-      /** Trees representing an expression in the source code */
-      val Term: TermCoreModule
-
-      /** Trees representing an expression in the source code */
-      trait TermCoreModule {
-
         /** Tree representing a reference to definition */
         type Ref = kernel.Ref
 
@@ -235,17 +229,9 @@ trait Core {
         /** Tree representing a while loop */
         type While = kernel.While
 
-      }
-
       /** Type tree representing a type written in the source */
       type TypeTree = kernel.TypeTree
 
-      /** Type trees representing a type written in the source */
-      val TypeTree: TypeTreeCoreModule
-
-      /** Type trees representing a type written in the source */
-      trait TypeTreeCoreModule {
-
         /** Type tree representing an inferred type */
         type Inferred = kernel.Inferred
 
@@ -285,8 +271,6 @@ trait Core {
         /** Type tree within a block with aliases `{ type U1 = ... ; T[U1, U2] }` */
         type TypeBlock = kernel.TypeBlock
 
-      }
-
       /** Type tree representing a type bound written in the source */
       type TypeBoundsTree = kernel.TypeBoundsTree
 

library/src/scala/tasty/reflect/Kernel.scala

@@ -40,7 +40,7 @@ package scala.tasty.reflect
  *           +- TypeTree ----+- Inferred
  *           |               +- TypeIdent
  *           |               +- TypeSelect
- *           |               +- Project
+ *           |               +- Projection
  *           |               +- Singleton
  *           |               +- Refined
  *           |               +- Applied