From 13ea342b7afc21d8e0ed7964c595a047b4d49fe3 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Mon, 28 Jan 2013 17:14:53 -0500 Subject: [PATCH] use standard Context.weakTypeOf --- .../src/main/scala/sbt/std/SettingMacro.scala | 5 ++--- main/settings/src/main/scala/sbt/std/TaskMacro.scala | 11 ++++------- .../src/main/scala/sbt/appmacro/ContextUtil.scala | 2 -- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/main/settings/src/main/scala/sbt/std/SettingMacro.scala b/main/settings/src/main/scala/sbt/std/SettingMacro.scala index eebb89a2d..28da3fee0 100644 --- a/main/settings/src/main/scala/sbt/std/SettingMacro.scala +++ b/main/settings/src/main/scala/sbt/std/SettingMacro.scala @@ -17,10 +17,9 @@ object InitializeConvert extends Convert { def apply[T: c.WeakTypeTag](c: reflect.macros.Context)(in: c.Tree): c.Tree = { - val u = appmacro.ContextUtil[c.type](c) - if(in.tpe <:< u.atypeOf[Initialize[Task[T]]] || in.tpe <:< u.atypeOf[Task[T]]) + if(in.tpe <:< c.weakTypeOf[Initialize[Task[T]]] || in.tpe <:< c.weakTypeOf[Task[T]]) c.abort(in.pos, "A setting cannot depend on a task") - else if(in.tpe <:< u.atypeOf[Initialize[T]]) + else if(in.tpe <:< c.weakTypeOf[Initialize[T]]) { val i = c.Expr[Initialize[T]](in) c.universe.reify( i.splice ).tree diff --git a/main/settings/src/main/scala/sbt/std/TaskMacro.scala b/main/settings/src/main/scala/sbt/std/TaskMacro.scala index 1b68c4316..1bbb83583 100644 --- a/main/settings/src/main/scala/sbt/std/TaskMacro.scala +++ b/main/settings/src/main/scala/sbt/std/TaskMacro.scala @@ -52,23 +52,20 @@ object FullInstance extends Instance.Composed[Initialize, Task](InitializeInstan object FullConvert extends Convert { def apply[T: c.WeakTypeTag](c: Context)(in: c.Tree): c.Tree = - { - val util = appmacro.ContextUtil[c.type](c) - if(in.tpe <:< util.atypeOf[Initialize[Task[T]]]) + if(in.tpe <:< c.weakTypeOf[Initialize[Task[T]]]) in - else if(in.tpe <:< util.atypeOf[Initialize[T]]) + else if(in.tpe <:< c.weakTypeOf[Initialize[T]]) { val i = c.Expr[Initialize[T]](in) c.universe.reify( Def.toITask(i.splice) ).tree } - else if(in.tpe <:< util.atypeOf[Task[T]]) + else if(in.tpe <:< c.weakTypeOf[Task[T]]) { val i = c.Expr[Task[T]](in) c.universe.reify( Def.valueStrict[Task[T]](i.splice) ).tree } else c.abort(in.pos, "Unknown input type: " + in.tpe) - } } object TaskMacro @@ -348,7 +345,7 @@ object TaskConvert extends Convert def apply[T: c.WeakTypeTag](c: Context)(in: c.Tree): c.Tree = { val u = appmacro.ContextUtil[c.type](c) - if(in.tpe <:< u.atypeOf[Task[T]]) + if(in.tpe <:< c.weakTypeOf[Task[T]]) in else c.abort(in.pos, "Unknown input type: " + in.tpe) diff --git a/util/appmacro/src/main/scala/sbt/appmacro/ContextUtil.scala b/util/appmacro/src/main/scala/sbt/appmacro/ContextUtil.scala index 3afc0d617..85a2aed50 100644 --- a/util/appmacro/src/main/scala/sbt/appmacro/ContextUtil.scala +++ b/util/appmacro/src/main/scala/sbt/appmacro/ContextUtil.scala @@ -48,8 +48,6 @@ final class ContextUtil[C <: Context](val ctx: C) def getPos(sym: Symbol) = if(sym eq null) NoPosition else sym.pos - def atypeOf[T](implicit att: WeakTypeTag[T]): Type = att.tpe - /** Constructs a unique term name with the given prefix within this Context. * (The current implementation uses Context.fresh, which increments*/ def freshTermName(prefix: String) = newTermName(ctx.fresh("$" + prefix))