summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build.sc47
-rw-r--r--core/src/main/scala/forge/Main.scala53
-rw-r--r--core/src/main/scala/forge/discover/Discovered.scala19
-rw-r--r--core/src/main/scala/forge/eval/Evaluator.scala2
-rw-r--r--core/src/test/scala/forge/JavaCompileJarTests.scala4
-rw-r--r--scalaplugin/src/main/scala/forge/scalaplugin/Subproject.scala10
6 files changed, 116 insertions, 19 deletions
diff --git a/build.sc b/build.sc
new file mode 100644
index 00000000..8d91c3e1
--- /dev/null
+++ b/build.sc
@@ -0,0 +1,47 @@
+import $cp.scalaplugin.target.`scala-2.12`.classes
+import ammonite.ops.pwd
+import coursier.{Dependency => Dep, Module => Mod}
+import forge.discover.Discovered
+import forge.eval.{Evaluator, PathRef}
+import forge.scalaplugin.Subproject.ScalaDep
+import forge.util.OSet
+import forge._
+import forge.scalaplugin._
+
+object Build{
+
+
+ object Core extends Subproject {
+ def scalaVersion = T{ "2.12.4" }
+ override def compileIvyDeps = T{
+ super.compileIvyDeps() ++ Seq[ScalaDep](
+ Dep(Mod("org.scala-lang", "scala-reflect"), scalaVersion(), configuration = "provided")
+ )
+ }
+
+ override def ivyDeps = T{
+ super.ivyDeps() ++ Seq[ScalaDep](
+ ScalaDep(Dep(Mod("com.lihaoyi", "sourcecode"), "0.1.4")),
+ ScalaDep(Dep(Mod("com.lihaoyi", "pprint"), "0.5.3")),
+ ScalaDep.Point(Dep(Mod("com.lihaoyi", "ammonite"), "1.0.3")),
+ ScalaDep(Dep(Mod("com.typesafe.play", "play-json"), "2.6.6")),
+ ScalaDep(Dep(Mod("org.scala-sbt", "zinc"), "1.0.3"))
+ )
+ }
+
+
+ def basePath = T{ pwd / 'core }
+ override def sources = T{ PathRef(pwd/'core/'src/'main/'scala) }
+ override def resources = T{ sources }
+ }
+ object ScalaPlugin extends Subproject {
+ def scalaVersion = T{ "2.12.4" }
+
+ override def depClasspath = T{ Seq(Core.compiled()) }
+ override def ivyDeps = T{ Core.ivyDeps }
+ def basePath = T{ pwd / 'scalaplugin }
+ override def sources = T{ PathRef(pwd/'scalaplugin/'src/'main/'scala) }
+ override def resources = T{ sources }
+ }
+}
+@main def main(): Any = Build -> forge.discover.Discovered[Build.type]
diff --git a/core/src/main/scala/forge/Main.scala b/core/src/main/scala/forge/Main.scala
index e3b89f60..3820244b 100644
--- a/core/src/main/scala/forge/Main.scala
+++ b/core/src/main/scala/forge/Main.scala
@@ -2,25 +2,58 @@ package forge
import ammonite.ops._
import ammonite.util.{Name, Res}
-import forge.discover.Discovered
+import forge.define.Target
+import forge.discover.{Discovered, NestedEntry}
import forge.eval.Evaluator
import forge.util.OSet
+import play.api.libs.json.Format
object Main {
def main(args: Array[String]): Unit = {
+ val List(buildFile, selector0, rest @_*) = args.toList
+ pprint.log((buildFile, selector0, rest))
+ val selector = selector0.split('.').toList
ammonite.Main().instantiateInterpreter() match{
+ case Left(problems) => pprint.log(problems)
case Right(interp) =>
- val result = ammonite.main.Scripts.runScript(pwd, Path(args(0), pwd), interp, Nil)
-
- val (obj, discovered) = result.asInstanceOf[Res.Success[(Any, Discovered[Any])]].s
- val mapping = Discovered.mapping(obj)(discovered)
- val workspacePath = pwd / 'target / 'javac
- val evaluator = new Evaluator(workspacePath, mapping)
- val evaluated = evaluator.evaluate(OSet.from(mapping.keys)).evaluated.filter(mapping.contains)
- (result, interp.watchedFiles)
- case Left(problems) => problems
+ val result = ammonite.main.Scripts.runScript(pwd, Path(buildFile, pwd), interp, Nil)
+
+ if (!result.isSuccess) println(result)
+ else{
+
+ val (obj, discovered) = result.asInstanceOf[Res.Success[(Any, Discovered[Any])]].s
+ val mapping = Discovered.mapping(obj)(discovered)
+ val workspacePath = pwd / 'out
+ val evaluator = new Evaluator(workspacePath, mapping)
+ val mainRoutes = discovered.mains.map(x => (x.path :+ x.entryPoint.name, Left(x)))
+ val targetRoutes = discovered.targets.map(x => x._1 -> Right(x))
+ val allRoutes = (mainRoutes ++ targetRoutes).toMap[
+ Seq[String],
+ Either[NestedEntry[Any, _], (Seq[String], Format[_], Any => Target[_])]
+ ]
+ allRoutes.get(selector) match{
+ case Some(Left(nestedEntryPoint)) =>
+ nestedEntryPoint.invoke(
+ obj,
+ ammonite.main.Scripts.groupArgs(rest.toList)
+ ) match{
+ case error: forge.discover.Router.Result.Error =>
+ println("Failed to evaluate main method: " + error)
+ case forge.discover.Router.Result.Success(target) =>
+ println("Found target! " + target)
+ val evaluated = evaluator.evaluate(OSet(target))
+ pprint.log(evaluated)
+ }
+
+ case None => println("Unknown selector: " + selector)
+ case Some(Right((_, _, targetFunc))) =>
+ val target = targetFunc(obj)
+ val evaluated = evaluator.evaluate(OSet(target))
+ pprint.log(evaluated)
+ }
+ }
}
}
diff --git a/core/src/main/scala/forge/discover/Discovered.scala b/core/src/main/scala/forge/discover/Discovered.scala
index fcf5ccbd..ae274fb3 100644
--- a/core/src/main/scala/forge/discover/Discovered.scala
+++ b/core/src/main/scala/forge/discover/Discovered.scala
@@ -1,7 +1,7 @@
package forge.discover
import forge.define.Target
-import forge.discover.Router.EntryPoint
+import forge.discover.Router.{EntryPoint, Result}
import play.api.libs.json.Format
import scala.language.experimental.macros
@@ -17,7 +17,11 @@ case class Labelled[T](target: Target[T],
segments: Seq[String])
-case class NestedEntry[T, V](path: Seq[String], resolve: T => V, entryPoint: EntryPoint[V])
+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]] = {
+ entryPoint.invoke(resolve(target),groupedArgs)
+ }
+}
object NestedEntry{
def make[T, V](path: Seq[String], resolve: T => V)
(entryPoint: EntryPoint[V]) = NestedEntry(path, resolve, entryPoint)
@@ -47,6 +51,7 @@ object Discovered {
import c.universe._
val tpe = c.weakTypeTag[T].tpe
def rec(segments: List[String], t: c.Type): (Seq[(Seq[String], Tree)], Seq[Seq[String]]) = {
+
val r = new Router(c)
val selfMains =
for(tree <- r.getAllRoutesForClass(t.asInstanceOf[r.c.Type]).asInstanceOf[Seq[c.Tree]])
@@ -55,17 +60,17 @@ object Discovered {
val items = for {
m <- t.members.toSeq
if
- (m.isTerm && (m.asTerm.isGetter || m.asTerm.isLazy)) ||
+ (m.isTerm && (m.asTerm.isGetter || m.asTerm.isLazy)) ||
m.isModule ||
(m.isMethod && m.typeSignature.paramLists.isEmpty && m.typeSignature.resultType <:< c.weakTypeOf[Target[_]])
- if !m.fullName.contains('$')
+ if !m.name.toString.contains('$')
} yield {
val extendedSegments = m.name.toString :: segments
val self =
if (m.typeSignature.resultType <:< c.weakTypeOf[Target[_]]) Seq(extendedSegments)
else Nil
- val (mains, children) = rec(extendedSegments, m.typeSignature)
+ val (mains, children) = rec(extendedSegments, m.typeSignature)
(mains, self ++ children)
}
@@ -100,10 +105,12 @@ object Discovered {
q"forge.discover.NestedEntry.make(Seq(..$segments), ($arg: $tpe) => $select)($entry)"
}
+ pprint.log(result.length)
+ pprint.log(nested.length)
c.Expr[Discovered[T]](q"""
new _root_.forge.discover.Discovered(
$result,
- _root_.scala.Seq(..$nested)
+ ${nested.toList}
)
""")
}
diff --git a/core/src/main/scala/forge/eval/Evaluator.scala b/core/src/main/scala/forge/eval/Evaluator.scala
index b52a342c..6f2d43f0 100644
--- a/core/src/main/scala/forge/eval/Evaluator.scala
+++ b/core/src/main/scala/forge/eval/Evaluator.scala
@@ -130,7 +130,7 @@ class Evaluator(workspacePath: Path,
object Evaluator{
class TopoSorted private[Evaluator] (val values: OSet[Target[_]])
- case class Results(values: Seq[Any], evaluated: OSet[Target[_]])
+ case class Results(values: Seq[Any], targets: OSet[Target[_]])
def groupAroundNamedTargets(topoSortedTargets: TopoSorted,
labeling: Map[Target[_], Labelled[_]]): MultiBiMap[Int, Target[_]] = {
diff --git a/core/src/test/scala/forge/JavaCompileJarTests.scala b/core/src/test/scala/forge/JavaCompileJarTests.scala
index 92e1d0e9..081290ca 100644
--- a/core/src/test/scala/forge/JavaCompileJarTests.scala
+++ b/core/src/test/scala/forge/JavaCompileJarTests.scala
@@ -56,12 +56,12 @@ object JavaCompileJarTests extends TestSuite{
def eval[T](t: Target[T]): (T, Int) = {
val evaluator = new Evaluator(workspacePath, mapping)
val evaluated = evaluator.evaluate(OSet(t))
- (evaluated.values(0).asInstanceOf[T], evaluated.evaluated.size)
+ (evaluated.values(0).asInstanceOf[T], evaluated.targets.size)
}
def check(targets: OSet[Target[_]], expected: OSet[Target[_]]) = {
val evaluator = new Evaluator(workspacePath, mapping)
- val evaluated = evaluator.evaluate(targets).evaluated.filter(mapping.contains)
+ val evaluated = evaluator.evaluate(targets).targets.filter(mapping.contains)
assert(evaluated == expected)
}
diff --git a/scalaplugin/src/main/scala/forge/scalaplugin/Subproject.scala b/scalaplugin/src/main/scala/forge/scalaplugin/Subproject.scala
index 287a2b05..b3dca832 100644
--- a/scalaplugin/src/main/scala/forge/scalaplugin/Subproject.scala
+++ b/scalaplugin/src/main/scala/forge/scalaplugin/Subproject.scala
@@ -193,4 +193,14 @@ abstract class Subproject extends Cacher{
import ammonite.ops._, ImplicitWd._
%('java, "-cp", (runDepClasspath().map(_.path) :+ compiled()).mkString(":"), mainClass)
}
+ @forge.discover.Router.main
+ def console() = T.command{
+ import ammonite.ops._, ImplicitWd._
+ %('java,
+ "-cp",
+ (runDepClasspath().map(_.path) :+ compiled()).mkString(":"),
+ "scala.tools.nsc.MainGenericRunner",
+ "-usejavacp"
+ )
+ }
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-27 21:01:31 +0000