From 79dfed0baabd14394ba078b62c7418ae0e738603 Mon Sep 17 00:00:00 2001 From: Eugene Burmako Date: Wed, 25 Apr 2012 19:37:26 +0300 Subject: removes Expr <-> Tree implicits --- test/files/run/macro-range/Expansion_Impossible_2.scala | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'test/files/run/macro-range/Expansion_Impossible_2.scala') diff --git a/test/files/run/macro-range/Expansion_Impossible_2.scala b/test/files/run/macro-range/Expansion_Impossible_2.scala index 7a093b74ee..051afff99c 100644 --- a/test/files/run/macro-range/Expansion_Impossible_2.scala +++ b/test/files/run/macro-range/Expansion_Impossible_2.scala @@ -14,7 +14,7 @@ object Impls { // scala"{ var i = $low; val h = $hi; while (i < h) { $f(i); i = i + 1 } } // or: // scala"($_this: RangeDefault).foreach($f)" - c.prefix.tree match { + Expr(c.prefix.tree match { case Apply(Select(New(tpt), initName), List(lo, hi)) if tpt.symbol.fullName == "Range" => val iname = newTermName("$i") val hname = newTermName("$h") @@ -23,7 +23,7 @@ object Impls { val labelname = newTermName("$while") val cond = makeBinop(iref, "$less", href) val body = Block( - List(makeApply(f, List(iref))), + List(makeApply(f.tree, List(iref))), Assign(iref, makeBinop(iref, "$plus", Literal(Constant(1))))) val generated = Block( @@ -37,10 +37,10 @@ object Impls { case _ => Apply( Select( - Typed(c.prefix, Ident(newTypeName("RangeDefault"))), + Typed(c.prefix.tree, Ident(newTypeName("RangeDefault"))), newTermName("foreach")), - List(f)) - } + List(f.tree)) + }) } } -- cgit v1.2.3