diff options
| author | Den Shabalin <den.shabalin@gmail.com> | 2013-09-26 18:41:02 +0200 |
|---|---|---|
| committer | Den Shabalin <den.shabalin@gmail.com> | 2013-10-14 13:30:49 +0200 |
| commit | debdd2f316934c417c7d9865ea0f2ea503e51b63 (patch) | |
| tree | 2f3b2697034dd260035c13adda75b7482f4ddbdd /src/compiler/scala/tools/nsc/typechecker/Typers.scala | |
| parent | 60603f2524bf7c06c6f73eefb1cc30b6df7c392d (diff) | |
| download | scala-debdd2f316934c417c7d9865ea0f2ea503e51b63.tar.gz scala-debdd2f316934c417c7d9865ea0f2ea503e51b63.tar.bz2 scala-debdd2f316934c417c7d9865ea0f2ea503e51b63.zip | |
use regular macro expansion logic for unapply quasiquotes
Previously due to limited support for expansion in apply position
quasiquotes had to use a compiler hook for deconstruction. Now with
recent changes in pattern matcher it's possible to remove that special
case.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Typers.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index 7bf342f475..3cd937313f 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -3274,8 +3274,7 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper // SI-7877 `isTerm` needed to exclude `class T[A] { def unapply(..) }; ... case T[X] =>` case HasUnapply(unapply) if mode.inPatternMode && fun.isTerm => - if (unapply == QuasiquoteClass_api_unapply) macroExpandUnapply(this, tree, fun, unapply, args, mode, pt) - else doTypedUnapply(tree, fun0, fun, args, mode, pt) + doTypedUnapply(tree, fun0, fun, args, mode, pt) case _ => if (treeInfo.isMacroApplication(tree)) duplErrorTree(MacroTooManyArgumentListsError(tree, fun.symbol)) |