PR comments.

scala · Jan 17, 2022 · 2a216a2 · 2a216a2
1 parent b0840a6
commit 2a216a2
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 3 deletions.
diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
@@ -57,7 +57,7 @@ object Parsers {
     val None = 0
     val Quoted = 1
     val Spliced = 1 << 1
-    val Pattern = 1 << 2
+    val QuotedPattern = 1 << 2
   }
 
   extension (buf: ListBuffer[Tree])
@@ -1578,7 +1578,7 @@ object Parsers {
         val expr =
           if (in.name.length == 1) {
             in.nextToken()
-            val inPattern = (staged & StageKind.Pattern) != 0
+            val inPattern = (staged & StageKind.QuotedPattern) != 0
             withinStaged(StageKind.Spliced)(if (inPattern) inBraces(pattern()) else stagedBlock())
           }
           else atSpan(in.offset + 1) {
@@ -2276,7 +2276,7 @@ object Parsers {
           blockExpr()
         case QUOTE =>
           atSpan(in.skipToken()) {
-            withinStaged(StageKind.Quoted | (if (location.inPattern) StageKind.Pattern else 0)) {
+            withinStaged(StageKind.Quoted | (if (location.inPattern) StageKind.QuotedPattern else 0)) {
               Quote {
                 if (in.token == LBRACKET) inBrackets(typ())
                 else stagedBlock()

diff --git a/tests/pos-macros/splice-pat/Macro_1.scala b/tests/pos-macros/splice-pat/Macro_1.scala
@@ -0,0 +1,17 @@
+import scala.quoted.*
+
+object Macro {
+  object MyMatcher {
+    def unapply(expr: Expr[Any])(using Quotes): Option[Expr[Int]] = expr match {
+      case '{ (${a}: Int) + (${_}: Int) } => Some(a)
+      case _ => None
+    }
+  }
+
+  def foo(x: Int): Int = x - 1
+
+  def impl(expr: Expr[Any])(using Quotes): Expr[(Int, Int)] = expr match
+    case '{foo(${bound@MyMatcher(x)})}=> '{($bound, $x)}
+
+  inline def macr(inline x: Int): (Int, Int) = ${impl('x)}
+}
diff --git a/tests/pos-macros/splice-pat/Test_1.scala b/tests/pos-macros/splice-pat/Test_1.scala
@@ -0,0 +1,3 @@
+object Test {
+  assert(Macro.macr(Macro.foo(1 + 2)) == (3, 1))
+}
diff --git a/tests/pos/splice-pat.scala b/tests/pos/splice-pat.scala
@@ -19,3 +19,6 @@ def twoLevel(expr: Expr[Any])(using Quotes): Expr[Int] = expr match
 
 def bindQuote(expr: Expr[Any])(using Quotes): Expr[Int] = expr match
   case '{ foo(${y@'{bar($_)}})} => y
+
+def noop(expr: Expr[Any])(using Quotes): Expr[Int] = expr match
+  case '{ bar(${ '{ $y }  }) } => y