Merge pull request #19 from kasiaMarek/fix-generic-args

fix: generic args in tyre `And`
kasiaMarek · Jul 22, 2024 · 6778023 · 6778023
2 parents 1fb074c + ece71ce
commit 6778023
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/main/scala/net/marek/tyre/pattern/StringInterpolator.scala b/src/main/scala/net/marek/tyre/pattern/StringInterpolator.scala
@@ -14,6 +14,10 @@ private def tyreImpl(sc: Expr[StringContext], args: Expr[Seq[Any]])(using Quotes
 
   import quotes.reflect.*
 
+  def isNETuple(tpe: TypeRepr): Boolean =
+    val tupleSymbol = Symbol.requiredClass("scala.NonEmptyTuple")
+    tpe <:< tupleSymbol.typeRef
+
   val parts: Seq[String] = sc match
     case '{ StringContext($t: _*) } =>
       t match
@@ -54,8 +58,11 @@ private def tyreImpl(sc: Expr[StringContext], args: Expr[Seq[Any]])(using Quotes
       toTyre(re1) match
         case '{ $ree1: Tyre[t1] } =>
           toTyre(re2) match
-            case '{ $ree2: Tyre[t2 *: t3] } => '{ AndF(${ ree1 }, ${ ree2 }) }
-            case '{ $ree2: Tyre[t2] } => '{ And(${ ree1 }, ${ ree2 }) }
+            case '{ $ree2: Tyre[t2] } =>
+              '{ ${ ree2 }.asInstanceOf[Tyre[t2]] } match
+                case '{ $ree2: Tyre[t2 *: t3] } if isNETuple(ree2.asTerm.tpe.widen.dealias.typeArgs.head) =>
+                  '{ AndF(${ ree1 }, ${ ree2 }) }
+                case '{ $ree2: Tyre[t2] } => '{ And(${ ree1 }, ${ ree2 }) }
     case ReOr(re1, re2) =>
       toTyre(re1) match
         case '{ $ree1: Tyre[t1] } =>

diff --git a/src/test/scala/net/marek/tyre/StringInterpolatorTest.scala b/src/test/scala/net/marek/tyre/StringInterpolatorTest.scala
@@ -36,3 +36,7 @@ class StringInterpolatorTest extends AnyFunSuite:
     assertResult(Some(Some('a')))(m.run("a"))
     assertResult(Some(None))(m.run(""))
     assertResult(None)(m.run("aa"))
+
+  test("generic"):
+    val _ = [T, B] => (aa : Tyre[T], bb: Tyre[B]) => tyre"$aa$bb"
+    val _ = [T, B] => (aa : Conv[Int *: EmptyTuple, T], bb: Tyre[B]) => tyre"$bb$aa"