Replace PrimitiveExprs by the sinlge class ConstantExpr

Author: nicolasstucki

compiler/src/dotty/tools/dotc/quoted/PickledQuotes.scala

@@ -24,10 +24,10 @@ object PickledQuotes {
     }
   }
 
-  /** Transform the expression into it's fully spliced Tree */
+  /** Transform the expression into its fully spliced Tree */
   def quotedToTree(expr: quoted.Quoted)(implicit ctx: Context): Tree = expr match {
     case expr: quoted.TastyQuoted => unpickleQuote(expr)
-    case expr: quoted.Liftable.PrimitiveExpr[_] => Literal(Constant(expr.value))
+    case expr: quoted.Liftable.ConstantExpr[_] => Literal(Constant(expr.value))
     case expr: RawQuoted => expr.tree
   }
 

library/src/scala/quoted/Liftable.scala

@@ -14,22 +14,16 @@ abstract class Liftable[T] {
  */
 object Liftable {
 
-  sealed abstract class PrimitiveExpr[T] extends Expr[T] {
-    def value: T
-  }
+  final class ConstantExpr[T] private[Liftable](val value: T) extends Expr[T]
 
-  private class ValueExpr[T <: AnyVal](val value: T) extends PrimitiveExpr[T]
+  implicit def BooleanIsLiftable: Liftable[Boolean] = (x: Boolean) => new ConstantExpr(x)
+  implicit def ByteLiftable: Liftable[Byte] = (x: Byte) => new ConstantExpr(x)
+  implicit def CharIsLiftable: Liftable[Char] = (x: Char) => new ConstantExpr(x)
+  implicit def ShortIsLiftable: Liftable[Short] = (x: Short) => new ConstantExpr(x)
+  implicit def IntIsLiftable: Liftable[Int] = (x: Int) => new ConstantExpr(x)
+  implicit def LongIsLiftable: Liftable[Long] = (x: Long) => new ConstantExpr(x)
+  implicit def FloatIsLiftable: Liftable[Float] = (x: Float) => new ConstantExpr(x)
+  implicit def DoubleIsLiftable: Liftable[Double] = (x: Double) => new ConstantExpr(x)
 
-  implicit def BooleanIsLiftable: Liftable[Boolean] = (x: Boolean) => new ValueExpr(x)
-  implicit def ByteLiftable: Liftable[Byte] = (x: Byte) => new ValueExpr(x)
-  implicit def CharIsLiftable: Liftable[Char] = (x: Char) => new ValueExpr(x)
-  implicit def ShortIsLiftable: Liftable[Short] = (x: Short) => new ValueExpr(x)
-  implicit def IntIsLiftable: Liftable[Int] = (x: Int) => new ValueExpr(x)
-  implicit def LongIsLiftable: Liftable[Long] = (x: Long) => new ValueExpr(x)
-  implicit def FloatIsLiftable: Liftable[Float] = (x: Float) => new ValueExpr(x)
-  implicit def DoubleIsLiftable: Liftable[Double] = (x: Double) => new ValueExpr(x)
-
-  private class StringExpr(val value: String) extends PrimitiveExpr[String]
-
-  implicit def StringIsLiftable: Liftable[String] = (x: String) => new StringExpr(x)
+  implicit def StringIsLiftable: Liftable[String] = (x: String) => new ConstantExpr(x)
 }