From b13b5a019a24d8b6eb1557d6f971169e723c1e15 Mon Sep 17 00:00:00 2001
From: Donggyu Kim
Date: Thu, 5 May 2016 20:37:49 -0700
Subject: get -> getOrElse

---
 chiselFrontend/src/main/scala/Chisel/internal/Builder.scala | 3 ++-
 src/main/scala/Chisel/Driver.scala                          | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/chiselFrontend/src/main/scala/Chisel/internal/Builder.scala b/chiselFrontend/src/main/scala/Chisel/internal/Builder.scala
index c7ecdaa0..d0e28b7c 100644
--- a/chiselFrontend/src/main/scala/Chisel/internal/Builder.scala
+++ b/chiselFrontend/src/main/scala/Chisel/internal/Builder.scala
@@ -94,7 +94,8 @@ private[Chisel] object Builder {
   // All global mutable state must be referenced via dynamicContextVar!!
   private val dynamicContextVar = new DynamicVariable[Option[DynamicContext]](None)
 
-  def dynamicContext: DynamicContext = dynamicContextVar.value.get
+  def dynamicContext: DynamicContext =
+    dynamicContextVar.value getOrElse (new DynamicContext)
   def idGen: IdGen = dynamicContext.idGen
   def globalNamespace: Namespace = dynamicContext.globalNamespace
   def components: ArrayBuffer[Component] = dynamicContext.components
diff --git a/src/main/scala/Chisel/Driver.scala b/src/main/scala/Chisel/Driver.scala
index 422a4110..830bc005 100644
--- a/src/main/scala/Chisel/Driver.scala
+++ b/src/main/scala/Chisel/Driver.scala
@@ -129,5 +129,5 @@ object Driver extends BackendCompilationUtilities {
     }
   }
 
-  def targetDir(): String = { target_dir.get }
+  def targetDir(): String = { target_dir getOrElse new File(".").getCanonicalPath }
 }
-- 
cgit v1.2.3