From d79b8bc8c741570fcc582f25ac8cfe6604cca970 Mon Sep 17 00:00:00 2001
From: Andrew Waterman
Date: Mon, 28 Mar 2016 21:50:18 -0700
Subject: Apply DeMorgan's law to improve assert code readability

---
 src/main/scala/Chisel/CoreUtil.scala | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/main/scala/Chisel/CoreUtil.scala b/src/main/scala/Chisel/CoreUtil.scala
index 829fa8ed..c3c5214f 100644
--- a/src/main/scala/Chisel/CoreUtil.scala
+++ b/src/main/scala/Chisel/CoreUtil.scala
@@ -48,14 +48,12 @@ object assert {
   }
 
   def apply_impl_do(cond: Bool, line: String, message: Option[String]) {
-    when (!Builder.dynamicContext.currentModule.get.reset) {
-      when(!cond) {
-        message match {
-          case Some(str) => printf(s"Assertion failed: $str\n    at $line\n")
-          case None => printf(s"Assertion failed\n    at $line\n")
-        }
-        pushCommand(Stop(Node(Builder.dynamicContext.currentModule.get.clock), 1))
+    when (!(cond || Builder.dynamicContext.currentModule.get.reset)) {
+      message match {
+        case Some(str) => printf(s"Assertion failed: $str\n    at $line\n")
+        case None => printf(s"Assertion failed\n    at $line\n")
       }
+      pushCommand(Stop(Node(Builder.dynamicContext.currentModule.get.clock), 1))
     }
   }
 
-- 
cgit v1.2.3