From 802cfc4405c28ae212a955a92c7a6ad2d2b6f0c2 Mon Sep 17 00:00:00 2001
From: Jack Koenig
Date: Thu, 17 Aug 2017 11:26:29 -0700
Subject: Make Reset a trait (#672)

Bool implements Reset. Compatibility package includes an implicit
conversion from Reset to Bool.---
 src/main/scala/chisel3/compatibility.scala       | 3 +++
 src/main/scala/chisel3/testers/BasicTester.scala | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/main')

diff --git a/src/main/scala/chisel3/compatibility.scala b/src/main/scala/chisel3/compatibility.scala
index e169fb8f..4d2d9311 100644
--- a/src/main/scala/chisel3/compatibility.scala
+++ b/src/main/scala/chisel3/compatibility.scala
@@ -195,6 +195,9 @@ package object Chisel {     // scalastyle:ignore package.object.name
   type Bool = chisel3.core.Bool
   object Bool extends BoolFactory
   val Mux = chisel3.core.Mux
+  type Reset = chisel3.core.Reset
+
+  implicit def resetToBool(reset: Reset): Bool = reset.toBool
 
   import chisel3.core.Param
   abstract class BlackBox(params: Map[String, Param] = Map.empty[String, Param]) extends chisel3.core.BlackBox(params) {
diff --git a/src/main/scala/chisel3/testers/BasicTester.scala b/src/main/scala/chisel3/testers/BasicTester.scala
index bd7d4027..6d1a4913 100644
--- a/src/main/scala/chisel3/testers/BasicTester.scala
+++ b/src/main/scala/chisel3/testers/BasicTester.scala
@@ -25,7 +25,7 @@ class BasicTester extends Module() {
     */
   def stop()(implicit sourceInfo: SourceInfo) {
     // TODO: rewrite this using library-style SourceInfo passing.
-    when (!reset) {
+    when (!reset.toBool) {
       pushCommand(Stop(sourceInfo, Node(clock), 0))
     }
   }
-- 
cgit v1.2.3