From 3c9e71547389d45d0b6876f0f1f0c6fe70b6902e Mon Sep 17 00:00:00 2001
From: Li Haoyi <haoyi.sg@gmail.com>
Date: Sun, 22 Oct 2017 09:54:37 -0700
Subject: Things compile again...

---
 src/main/scala/forge/DefCtx.scala     |  2 +-
 src/main/scala/forge/Evaluator.scala  | 13 ++++++++-----
 src/test/scala/forge/ForgeTests.scala |  6 +++++-
 3 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/main/scala/forge/DefCtx.scala b/src/main/scala/forge/DefCtx.scala
index 57f2e71e..251e671b 100644
--- a/src/main/scala/forge/DefCtx.scala
+++ b/src/main/scala/forge/DefCtx.scala
@@ -23,7 +23,7 @@ object DefCtx{
     def applyImpl(c: Context): c.Expr[StaticContext] = {
       import c.universe._
       val staticContext = rec(c)(c.internal.enclosingOwner)
-      c.Expr[StaticContext](q"hbt.DefCtx.StaticContext($staticContext)")
+      c.Expr[StaticContext](q"forge.DefCtx.StaticContext($staticContext)")
     }
   }
 
diff --git a/src/main/scala/forge/Evaluator.scala b/src/main/scala/forge/Evaluator.scala
index 137943f7..9beebe52 100644
--- a/src/main/scala/forge/Evaluator.scala
+++ b/src/main/scala/forge/Evaluator.scala
@@ -48,11 +48,14 @@ class Evaluator(workspacePath: jnio.Path,
       val target = transitiveTargets(index)
       val inputResults = target.inputs.map(results)
 
-      for(enclosing <- target.defCtx.staticEnclosing){
-        val targetDestPath = workspacePath.resolve(
-          jnio.Paths.get(enclosing.stripSuffix(enclosingBase.staticEnclosing.getOrElse("")))
-        )
-        deleteRec(targetDestPath)
+      val targetDestPath = target.defCtx.staticEnclosing match{
+        case Some(enclosing) =>
+          val targetDestPath = workspacePath.resolve(
+            jnio.Paths.get(enclosing.stripSuffix(enclosingBase.staticEnclosing.getOrElse("")))
+          )
+          deleteRec(targetDestPath)
+          targetDestPath
+        case None => jnio.Files.createTempDirectory(null)
       }
 
 
diff --git a/src/test/scala/forge/ForgeTests.scala b/src/test/scala/forge/ForgeTests.scala
index 91e20f45..c3414be9 100644
--- a/src/test/scala/forge/ForgeTests.scala
+++ b/src/test/scala/forge/ForgeTests.scala
@@ -2,8 +2,12 @@ package forge
 
 import utest._
 import Target.noop
-
+import java.nio.{file => jnio}
 object ForgeTests extends TestSuite{
+  val evaluator = new Evaluator(
+    jnio.Paths.get("target/workspace"),
+    implicitly
+  )
   object Singleton {
     val single = noop()
   }
-- 
cgit v1.2.3