From 8a873f3336400035a9fae5ed64a57b022d9b48da Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Sun, 5 Nov 2017 08:18:46 -0800 Subject: First set of standalone tests for the gnarly `Applicative` logic --- core/src/main/scala/forge/define/Target.scala | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'core/src/main/scala/forge/define/Target.scala') diff --git a/core/src/main/scala/forge/define/Target.scala b/core/src/main/scala/forge/define/Target.scala index 0aafee89..b30db434 100644 --- a/core/src/main/scala/forge/define/Target.scala +++ b/core/src/main/scala/forge/define/Target.scala @@ -6,10 +6,7 @@ import forge.eval.PathRef import forge.util.{Args, JsonFormatters} import play.api.libs.json.{Format, Json} -import scala.annotation.compileTimeOnly -import scala.collection.mutable import scala.language.experimental.macros -import scala.reflect.macros.blackbox.Context abstract class Target[T] extends Target.Ops[T] with Applyable[T]{ /** @@ -29,8 +26,8 @@ abstract class Target[T] extends Target.Ops[T] with Applyable[T]{ def sideHash: Int = 0 } -object Target extends Applicative.Applyer[Target]{ - +object Target extends Applicative.Applyer[Target, Target]{ + def underlying[A](v: Target[A]) = v type Cacher = Applicative.Cacher[Target[_]] class Target0[T](t: T) extends Target[T]{ lazy val t0 = t -- cgit v1.2.3