From ac5bf6a4c953fe39fa97d77bc620c515dc9e1622 Mon Sep 17 00:00:00 2001
From: Andrew Waterman
Date: Thu, 13 Aug 2015 18:19:01 -0700
Subject: Make error reporting reentrant

---
 src/main/scala/Chisel/Driver.scala | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'src/main/scala/Chisel/Driver.scala')

diff --git a/src/main/scala/Chisel/Driver.scala b/src/main/scala/Chisel/Driver.scala
index 682988f8..b1fa831c 100644
--- a/src/main/scala/Chisel/Driver.scala
+++ b/src/main/scala/Chisel/Driver.scala
@@ -81,11 +81,7 @@ object Driver extends FileSystemUtilities {
     */
   private[Chisel] def elaborateWrappedModule[T <: Module](gen: () => T, p: Parameters, c: Option[ChiselConfig]) {
     try {
-      ChiselError.clear()
-      ChiselError.info("Elaborating design...")
       val ir = Builder.build(gen())
-      ChiselError.info("Done elaborating.")
-
       val name = c match {
         case None => ir.name
         case Some(config) => s"${ir.name}.$config"
@@ -94,8 +90,8 @@ object Driver extends FileSystemUtilities {
       createOutputFile(s"$name.cst", p.getConstraints)
       createOutputFile(s"$name.prm", ir.parameterDump.getDump)
       createOutputFile(s"$name.fir", ir.emit)
-    } finally {
-      ChiselError.report
+    } catch {
+      case e: ChiselException => println(e.getMessage)
     }
   }
   def elaborate[T <: Module](gen: () => T): Unit =
-- 
cgit v1.2.3