summaryrefslogtreecommitdiff
path: root/src/main/scala/Chisel/Utils.scala
diff options
context:
space:
mode:
authorPalmer Dabbelt2015-10-21 16:00:19 -0700
committerPalmer Dabbelt2015-10-21 16:00:19 -0700
commit90bde8730fd71c3a5fc0b026064a4f1004e43d0f (patch)
tree99b1e01d507e4d71f45e88d65d452bd65566a0bd /src/main/scala/Chisel/Utils.scala
parentd40c0009383dc8c8d9c8514478a5b406a5e789a8 (diff)
parentcff13b54421095190314c724896842abf4dd2dc1 (diff)
Merge pull request #27 from ucb-bar/scalastyle-types
Add explicit types for public methods
Diffstat (limited to 'src/main/scala/Chisel/Utils.scala')
-rw-r--r--src/main/scala/Chisel/Utils.scala6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/scala/Chisel/Utils.scala b/src/main/scala/Chisel/Utils.scala
index a7a18193..68005f7f 100644
--- a/src/main/scala/Chisel/Utils.scala
+++ b/src/main/scala/Chisel/Utils.scala
@@ -89,12 +89,12 @@ object RegInit {
/** A register with an Enable signal */
object RegEnable
{
- def apply[T <: Data](updateData: T, enable: Bool) = {
+ def apply[T <: Data](updateData: T, enable: Bool): T = {
val r = Reg(updateData)
when (enable) { r := updateData }
r
}
- def apply[T <: Data](updateData: T, resetData: T, enable: Bool) = {
+ def apply[T <: Data](updateData: T, resetData: T, enable: Bool): T = {
val r = RegInit(resetData)
when (enable) { r := updateData }
r
@@ -185,7 +185,7 @@ object is { // Begin deprecation of non-type-parameterized is statements.
* } }}}*/
object switch {
def apply[T <: Bits](cond: T)(x: => Unit): Unit = macro impl
- def impl(c: Context)(cond: c.Tree)(x: c.Tree) = { import c.universe._
+ def impl(c: Context)(cond: c.Tree)(x: c.Tree): c.Tree = { import c.universe._
val sc = c.universe.internal.reificationSupport.freshTermName("sc")
def extractIsStatement(tree: Tree): List[c.universe.Tree] = tree match {
case q"Chisel.is.apply( ..$params )( ..$body )" => List(q"$sc.is( ..$params )( ..$body )")