diff options
Diffstat (limited to 'core/src/main/scala/forge/discover')
-rw-r--r-- | core/src/main/scala/forge/discover/Discovered.scala | 18 | ||||
-rw-r--r-- | core/src/main/scala/forge/discover/Router.scala | 6 |
2 files changed, 12 insertions, 12 deletions
diff --git a/core/src/main/scala/forge/discover/Discovered.scala b/core/src/main/scala/forge/discover/Discovered.scala index 3b08f7f7..53536e49 100644 --- a/core/src/main/scala/forge/discover/Discovered.scala +++ b/core/src/main/scala/forge/discover/Discovered.scala @@ -1,24 +1,24 @@ package forge.discover -import forge.define.Target +import forge.define.Task import forge.discover.Router.{EntryPoint, Result} import play.api.libs.json.Format import scala.language.experimental.macros import scala.reflect.macros.blackbox.Context -class Discovered[T](val targets: Seq[(Seq[String], Format[_], T => Target[_])], +class Discovered[T](val targets: Seq[(Seq[String], Format[_], T => Task[_])], val mains: Seq[NestedEntry[T, _]]){ def apply(t: T) = targets.map{case (a, f, b) => (a, f, b(t)) } } -case class Labelled[T](target: Target[T], +case class Labelled[T](target: Task[T], format: Format[T], segments: Seq[String]) case class NestedEntry[T, V](path: Seq[String], resolve: T => V, entryPoint: EntryPoint[V]){ - def invoke(target: T, groupedArgs: Seq[(String, Option[String])]): Result[Target[Any]] = { + def invoke(target: T, groupedArgs: Seq[(String, Option[String])]): Result[Task[Any]] = { entryPoint.invoke(resolve(target),groupedArgs) } } @@ -34,14 +34,14 @@ object Discovered { } yield path inconsistent } - def makeTuple[T, V](path: Seq[String], func: T => Target[V])(implicit f: Format[V]) = { + def makeTuple[T, V](path: Seq[String], func: T => Task[V])(implicit f: Format[V]) = { (path, f, func) } - def mapping[T: Discovered](t: T): Map[Target[_], Labelled[_]] = { + def mapping[T: Discovered](t: T): Map[Task[_], Labelled[_]] = { implicitly[Discovered[T]].apply(t) - .map(x => x._3 -> Labelled(x._3.asInstanceOf[Target[Any]], x._2.asInstanceOf[Format[Any]], x._1)) + .map(x => x._3 -> Labelled(x._3.asInstanceOf[Task[Any]], x._2.asInstanceOf[Format[Any]], x._1)) .toMap } @@ -62,12 +62,12 @@ object Discovered { if (m.isTerm && (m.asTerm.isGetter || m.asTerm.isLazy)) || m.isModule || - (m.isMethod && m.typeSignature.paramLists.isEmpty && m.typeSignature.resultType <:< c.weakTypeOf[Target[_]]) + (m.isMethod && m.typeSignature.paramLists.isEmpty && m.typeSignature.resultType <:< c.weakTypeOf[Task[_]]) if !m.name.toString.contains('$') } yield { val extendedSegments = m.name.toString :: segments val self = - if (m.typeSignature.resultType <:< c.weakTypeOf[Target[_]]) Seq(extendedSegments) + if (m.typeSignature.resultType <:< c.weakTypeOf[Task[_]]) Seq(extendedSegments) else Nil val (mains, children) = rec(extendedSegments, m.typeSignature) diff --git a/core/src/main/scala/forge/discover/Router.scala b/core/src/main/scala/forge/discover/Router.scala index afb526c7..2c92d847 100644 --- a/core/src/main/scala/forge/discover/Router.scala +++ b/core/src/main/scala/forge/discover/Router.scala @@ -1,7 +1,7 @@ package forge.discover import ammonite.main.Compat -import forge.define.Target +import forge.define.Task import sourcecode.Compat.Context import scala.annotation.StaticAnnotation @@ -57,8 +57,8 @@ object Router{ argSignatures: Seq[ArgSig[T]], doc: Option[String], varargs: Boolean, - invoke0: (T, Map[String, String], Seq[String]) => Result[Target[Any]]){ - def invoke(target: T, groupedArgs: Seq[(String, Option[String])]): Result[Target[Any]] = { + invoke0: (T, Map[String, String], Seq[String]) => Result[Task[Any]]){ + def invoke(target: T, groupedArgs: Seq[(String, Option[String])]): Result[Task[Any]] = { var remainingArgSignatures = argSignatures.toList |