diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2013-10-23 05:41:34 -0700 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2013-10-23 05:41:34 -0700 |
| commit | 288992bd63a5f08a696c32ffe2450e51946047d6 (patch) | |
| tree | 4013d3ebfc9b50c127d60f69ab5ede8a4ce7bcf9 /src | |
| parent | 1021a38979b2264442112c13bcf4538d22c661c1 (diff) | |
| parent | 6d4f43503f718610182d9529695d7aed02333e37 (diff) | |
| download | scala-288992bd63a5f08a696c32ffe2450e51946047d6.tar.gz scala-288992bd63a5f08a696c32ffe2450e51946047d6.tar.bz2 scala-288992bd63a5f08a696c32ffe2450e51946047d6.zip | |
Merge pull request #3059 from densh/pull/si-6840
SI-6840 fixes weird typing of quasiquote arguments
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/reflect/quasiquotes/Quasiquotes.scala | 2 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/api/Quasiquotes.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/reflect/quasiquotes/Quasiquotes.scala b/src/compiler/scala/tools/reflect/quasiquotes/Quasiquotes.scala index 9e98dcbc8b..f4d6b39d02 100644 --- a/src/compiler/scala/tools/reflect/quasiquotes/Quasiquotes.scala +++ b/src/compiler/scala/tools/reflect/quasiquotes/Quasiquotes.scala @@ -15,7 +15,7 @@ abstract class Quasiquotes extends Parsers if (settings.Yquasiquotedebug.value) println(msg) lazy val (universe: Tree, args, parts, parse, reify, method) = c.macroApplication match { - case Apply(Select(Select(Apply(Select(universe0, _), List(Apply(_, parts0))), interpolator0), method0), args0) => + case Apply(build.SyntacticTypeApplied(Select(Select(Apply(Select(universe0, _), List(Apply(_, parts0))), interpolator0), method0), _), args0) => debug(s"\nparse prefix:\nuniverse=$universe0\nparts=$parts0\ninterpolator=$interpolator0\nmethod=$method0\nargs=$args0\n") val parts1 = parts0.map { case lit @ Literal(Constant(s: String)) => s -> lit.pos diff --git a/src/reflect/scala/reflect/api/Quasiquotes.scala b/src/reflect/scala/reflect/api/Quasiquotes.scala index 8e993af382..3687ccba63 100644 --- a/src/reflect/scala/reflect/api/Quasiquotes.scala +++ b/src/reflect/scala/reflect/api/Quasiquotes.scala @@ -7,7 +7,7 @@ trait Quasiquotes { self: Universe => // using the mechanism implemented in `scala.tools.reflect.FastTrack` implicit class Quasiquote(ctx: StringContext) { protected trait api { - def apply(args: Any*): Any = macro ??? + def apply[T](args: T*): Any = macro ??? def unapply(scrutinee: Any): Any = macro ??? } object q extends api |