Merge pull request #10054 from rssh/overloaded-with-retry-path

Added in  reflect Select.overloaded parameter for expected result type [WIP]

Author: nicolasstucki

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

@@ -414,6 +414,9 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext:
         withDefaultPos(tpd.Select(qualifier, name.toTermName))
       def overloaded(qualifier: Term, name: String, targs: List[Type], args: List[Term]): Apply =
         withDefaultPos(tpd.applyOverloaded(qualifier, name.toTermName, args, targs, Types.WildcardType).asInstanceOf[Apply])
+        
+      def overloaded(qualifier: Term, name: String, targs: List[Type], args: List[Term], returnType: Type): Apply =
+        withDefaultPos(tpd.applyOverloaded(qualifier, name.toTermName, args, targs, returnType).asInstanceOf[Apply])
       def copy(original: Tree)(qualifier: Term, name: String): Select =
         tpd.cpy.Select(original)(qualifier, name.toTermName)
       def unapply(x: Select): Option[(Term, String)] =
@@ -2049,6 +2052,9 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext:
     object TypeBounds extends TypeBoundsModule:
       def apply(low: Type, hi: Type): TypeBounds = Types.TypeBounds(low, hi)
       def unapply(x: TypeBounds): Option[(Type, Type)] = Some((x.low, x.hi))
+      def empty: TypeBounds = Types .TypeBounds.empty
+      def upper(hi: Type): TypeBounds = Types .TypeBounds.upper(hi)
+      def lower(lo: Type): TypeBounds = Types .TypeBounds.lower(lo)
     end TypeBounds
 
     object TypeBoundsMethodsImpl extends TypeBoundsMethods:

library/src/scala/tasty/Reflection.scala

@@ -515,6 +515,9 @@ trait Reflection { reflection =>
     // TODO rename, this returns an Apply and not a Select
     /** Call an overloaded method with the given type and term parameters */
     def overloaded(qualifier: Term, name: String, targs: List[Type], args: List[Term]): Apply
+      
+    /** Call an overloaded method with the given type and term parameters */
+    def overloaded(qualifier: Term, name: String, targs: List[Type], args: List[Term], returnType: Type): Apply
 
     def copy(original: Tree)(qualifier: Term, name: String): Select
 
@@ -2297,6 +2300,9 @@ trait Reflection { reflection =>
   trait TypeBoundsModule { this: TypeBounds.type =>
     def apply(low: Type, hi: Type): TypeBounds
     def unapply(x: TypeBounds): Option[(Type, Type)]
+    def empty: TypeBounds
+    def upper(hi: Type): TypeBounds
+    def lower(lo: Type): TypeBounds
   }
 
   given TypeBoundsMethods as TypeBoundsMethods = TypeBoundsMethodsImpl

tests/neg-staging/i5941/macro_1.scala

@@ -17,7 +17,7 @@ object Lens {
     import util._
     // obj.copy(field = value)
     def setterBody(obj: Expr[S], value: Expr[T], field: String): Expr[S] =
-      Select.overloaded(obj.unseal, "copy", Nil, NamedArg(field, value.unseal) :: Nil).seal.cast[S]
+      Select.overloaded(obj.unseal, "copy", Nil, NamedArg(field, value.unseal) :: Nil, TypeBounds.empty).seal.cast[S]
 
     // exception: getter.unseal.underlyingArgument
     getter.unseal match {
@@ -51,4 +51,4 @@ object GenLens {
   class MkGenLens[S] {
     inline def apply[T](get: => (S => T)): Lens[S, T] = ${ Lens.impl('get) }
   }
-}
+}

tests/run-macros/i5941/macro_1.scala

@@ -217,4 +217,4 @@ object GenPrism {
    *   }(jstr => jstr)
    */
   inline def apply[S, A <: S]: Prism[S, A] = ${ Prism.impl[S, A] }
-}
+}

tests/run-macros/tasty-overload-secondargs.check

@@ -0,0 +1,2 @@
+partialFunction
+partialFunction

tests/run-macros/tasty-overload-secondargs/Macro_1.scala

@@ -0,0 +1,34 @@
+import scala.quoted._
+
+object X:
+
+  def andThen[A,B](a:A)(f: A => B): B =
+     println("totalFunction")
+     f(a)
+
+  def andThen[A,B](a:A)(f: PartialFunction[A,B]): Option[B] =
+     println("partialFunction")
+     f.lift.apply(a)
+
+
+object Macro:
+
+    inline def mThen[A,B](inline x:A=>B):B = ${
+       mThenImpl[A,B,A=>B,B]('x)
+    }
+
+    inline def mThen[A,B](inline x:PartialFunction[A,B]): Option[B] = ${
+       mThenImpl[A,B,PartialFunction[A,B],Option[B]]('x)
+    }
+    
+    def mThenImpl[A:Type, B:Type, S<:(A=>B) :Type, R:Type](x:Expr[S])(using qctx: QuoteContext):Expr[R]=
+       import qctx.reflect._
+       val fun = '{X}.unseal
+       val returnType = quoted.Type[(S) => ?].unseal.tpe
+       val firstPart = Select.overloaded(fun,"andThen",
+                                 List(TypeIdent(defn.IntClass).tpe, TypeIdent(defn.IntClass).tpe),
+                                 List(Literal(Constant.Int(1))),
+                                 quoted.Type[(S) => R].unseal.tpe
+                       )
+       val r = Apply(firstPart,List(x.unseal))
+       r.seal.cast[R]

tests/run-macros/tasty-overload-secondargs/Test_2.scala

@@ -0,0 +1,5 @@
+object Test:
+
+ def main(args:Array[String]):Unit =
+    val x1 = X.andThen(1){case x if (x%2 == 0) => x}
+    val x2 = Macro.mThen{case x:Int if (x%2 == 0) => x}