summaryrefslogtreecommitdiff
path: root/core/src/main/scala/forge/Target.scala
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2017-11-04 13:57:01 -0700
committerLi Haoyi <haoyi.sg@gmail.com>2017-11-04 13:57:01 -0700
commitbc6eb79f74a30aef2eb874eb7ba3c443c49e7554 (patch)
tree8302e85440240d13006694dcdace9b77a4ee0778 /core/src/main/scala/forge/Target.scala
parentc103d7b024c3b0edce800c0dbd4cfaffd1aabfba (diff)
downloadmill-bc6eb79f74a30aef2eb874eb7ba3c443c49e7554.tar.gz
mill-bc6eb79f74a30aef2eb874eb7ba3c443c49e7554.tar.bz2
mill-bc6eb79f74a30aef2eb874eb7ba3c443c49e7554.zip
Add some basic compile-time checks to enforce usage of `T{...}` within traits
Diffstat (limited to 'core/src/main/scala/forge/Target.scala')
-rw-r--r--core/src/main/scala/forge/Target.scala16
1 files changed, 12 insertions, 4 deletions
diff --git a/core/src/main/scala/forge/Target.scala b/core/src/main/scala/forge/Target.scala
index a6e977ae..ae5b488b 100644
--- a/core/src/main/scala/forge/Target.scala
+++ b/core/src/main/scala/forge/Target.scala
@@ -2,7 +2,7 @@ package forge
import ammonite.ops.{ls, mkdir}
-import forge.util.{Args, PathRef}
+import forge.util.{Args, LocalDef, PathRef}
import play.api.libs.json.{Format, JsValue, Json}
import scala.annotation.compileTimeOnly
@@ -34,8 +34,10 @@ abstract class Target[T] extends Target.Ops[T]{
object Target{
trait Cacher{
private[this] val cacherLazyMap = mutable.Map.empty[sourcecode.Enclosing, Target[_]]
- protected[this] def T[T](t: T): Target[T] = macro impl[T]
- protected[this] def T[T](t: => Target[T])(implicit c: sourcecode.Enclosing): Target[T] = {
+ protected[this] def T[T](t: T)
+ (implicit l: LocalDef): Target[T] = macro localDefImpl[T]
+ protected[this] def T[T](t: => Target[T])
+ (implicit c: sourcecode.Enclosing, l: LocalDef): Target[T] = {
cacherLazyMap.getOrElseUpdate(c, t).asInstanceOf[Target[T]]
}
}
@@ -46,7 +48,13 @@ object Target{
}
def apply[T](t: Target[T]): Target[T] = t
def apply[T](t: T): Target[T] = macro impl[T]
- def impl[T: c.WeakTypeTag](c: Context)(t: c.Expr[T]): c.Expr[Target[T]] = {
+ def localDefImpl[T: c.WeakTypeTag](c: Context)
+ (t: c.Expr[T])
+ (l: c.Expr[LocalDef]): c.Expr[Target[T]] = {
+ impl(c)(t)
+ }
+ def impl[T: c.WeakTypeTag](c: Context)
+ (t: c.Expr[T]): c.Expr[Target[T]] = {
import c.universe._
val bound = collection.mutable.Buffer.empty[(c.Tree, Symbol)]
val OptionGet = c.universe.typeOf[Target[_]].member(TermName("apply"))